backport performance tests to 34xperf_34x

1084 files changed, 31872 insertions, 4 deletions

diff --git a/apitools/org.eclipse.pde.api.tools.tests/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/META-INF/MANIFEST.MF
index 20ae582ad0..c1f31dd82e 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/META-INF/MANIFEST.MF
+++ b/apitools/org.eclipse.pde.api.tools.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: API Tooling Tests
 Bundle-SymbolicName: org.eclipse.pde.api.tools.tests
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
 Bundle-Vendor: Eclipse.org
 Require-Bundle: org.eclipse.core.runtime,
  org.junit,
@@ -23,9 +23,13 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.jdt.core.tests.compiler
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.pde.api.tools.builder.tests,
+ org.eclipse.pde.api.tools.builder.tests.performance,
  org.eclipse.pde.api.tools.comparator.tests,
  org.eclipse.pde.api.tools.model.tests;uses:="junit.framework,org.eclipse.pde.api.tools.model.component",
+ org.eclipse.pde.api.tools.problems.tests,
  org.eclipse.pde.api.tools.reference.tests,
  org.eclipse.pde.api.tools.tests,
  org.eclipse.pde.api.tools.tests.util,
  org.eclipse.pde.api.tools.util.tests;uses:="junit.framework"
+Bundle-Activator: org.eclipse.pde.api.tools.tests.ApiTestsPlugin
+Bundle-ActivationPolicy: lazy
diff --git a/apitools/org.eclipse.pde.api.tools.tests/build.properties b/apitools/org.eclipse.pde.api.tools.tests/build.properties
index 8da7113043..df5151321f 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/build.properties
+++ b/apitools/org.eclipse.pde.api.tools.tests/build.properties
@@ -26,5 +26,6 @@ bin.includes = META-INF/,\
                about.html,\
                test-analyzer-1/,\
                test-analyzer-2/,\
-               test-plugins-with-desc/
+               test-plugins-with-desc/,\
+               test-builder/
 javacWarnings..=-unchecked,-raw
diff --git a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/ApiBuilderTest.java b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/ApiBuilderTest.java
new file mode 100644
index 0000000000..1b7867a409
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/ApiBuilderTest.java
@@ -0,0 +1,1004 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.pde.api.tools.builder.tests;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.URI;
+import java.util.Arrays;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.List;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Preferences;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IPackageFragment;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.core.tests.builder.BuilderTests;
+import org.eclipse.jdt.core.tests.junit.extension.TestCase;
+import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
+import org.eclipse.pde.api.tools.internal.IApiCoreConstants;
+import org.eclipse.pde.api.tools.internal.provisional.ApiPlugin;
+import org.eclipse.pde.api.tools.internal.provisional.IApiMarkerConstants;
+import org.eclipse.pde.api.tools.internal.provisional.problems.IApiProblemTypes;
+import org.eclipse.pde.api.tools.model.tests.TestSuiteHelper;
+import org.eclipse.pde.api.tools.tests.util.ProjectUtils;
+import org.eclipse.ui.dialogs.IOverwriteQuery;
+import org.eclipse.ui.wizards.datatransfer.FileSystemStructureProvider;
+import org.eclipse.ui.wizards.datatransfer.ImportOperation;
+
+/**
+ * Base class for API builder tests
+ * 
+ * @since 1.0
+ */
+public abstract class ApiBuilderTest extends BuilderTests {
+	/**
+	 * Debug flag
+	 */
+	protected static boolean DEBUG = false;
+	
+	public static final String TEST_SOURCE_ROOT = "test-builder";
+	public static final String JAVA_EXTENSION = ".java";
+	public static final String SRC_ROOT = "src";
+	public static final String BIN_ROOT = "bin";
+	protected final int[] NO_PROBLEM_IDS = new int[0];
+	
+	private int[] fProblems = null;
+	private String[][] fMessageArgs = null;
+	
+	/**
+	 * Constructor
+	 * @param name
+	 */
+	public ApiBuilderTest(String name) {
+		super(name);
+	}
+	
+	/**
+	 * Returns the contents of the source file in the given category with the given name
+	 * @param srcpath the path to the folder containing the test source
+	 * @param srcname the name of the test (which is the name of the file)
+	 * @return the contents of the source file as a string, or <code>null</code>
+	 */
+	protected String getSourceContents(IPath srcpath, String srcname) {
+		String contents = null;
+		IPath path = TestSuiteHelper.getPluginDirectoryPath().append(TEST_SOURCE_ROOT).append(srcpath).append(srcname+JAVA_EXTENSION);
+		File file = path.toFile();
+		if(file.exists()) {
+			contents = getFileContentAsString(file);
+		}
+		return contents;
+	}
+	
+	/**
+	 * Returns the contents of the given file as a string, or <code>null</code>
+	 * @param file the file to get the contents for
+	 * @return the contents of the file as a {@link String} or <code>null</code>
+	 */
+	public static String getFileContentAsString(File file) {
+		String contents = null;
+		FileInputStream stream = null;
+		try {
+			stream = new FileInputStream(file);
+			char[] array = org.eclipse.pde.api.tools.internal.util.Util.getInputStreamAsCharArray(stream, -1, IApiCoreConstants.UTF_8);
+			contents = new String(array);
+		}
+		catch(IOException ioe) {
+			ApiPlugin.log(ioe);
+		} finally {
+			if (stream != null) {
+				try {
+					stream.close();
+				} catch (IOException e) {
+					// ignore
+				}
+			}
+		}
+		return contents;
+	}		
+	
+	/**
+	 * @return the testing environment cast the the one we want
+	 */
+	protected ApiTestingEnvironment getEnv() {
+		return (ApiTestingEnvironment) env;
+	}
+	
+	/** 
+	 * Verifies that the workspace has no problems.
+	 */
+	protected void expectingNoProblems() {
+		expectingNoProblemsFor(getEnv().getWorkspaceRootPath());
+	}
+
+	/** 
+	 * Verifies that the given element has no problems.
+	 */
+	protected void expectingNoProblemsFor(IPath root) {
+		expectingNoProblemsFor(new IPath[] { root });
+	}
+
+	/** 
+	 * Verifies that the given elements have no problems.
+	 */
+	protected void expectingNoProblemsFor(IPath[] roots) {
+		StringBuffer buffer = new StringBuffer();
+		ApiProblem[] problems = allSortedApiProblems(roots);
+		if (problems != null) {
+			for (int i = 0, length = problems.length; i<length; i++) {
+				buffer.append(problems[i]+"\n");
+			}
+		}
+		String actual = buffer.toString();
+		assumeEquals("Unexpected problem(s)!!!", "", actual); //$NON-NLS-1$
+	}
+
+	/** 
+	 * Verifies that the given element has problems and
+	 * only the given element.
+	 */
+	protected void expectingOnlyProblemsFor(IPath expected) {
+		expectingOnlyProblemsFor(new IPath[] { expected });
+	}
+
+	/**
+	 * Creates a set of the default problem ids of the given count
+	 * @param numproblems
+	 * @return the set of default problem ids, or an empty set.
+	 */
+	protected int[] getDefaultProblemIdSet(int numproblems) {
+		if(numproblems < 0) {
+			return NO_PROBLEM_IDS;
+		}
+		int[] set = new int[numproblems];
+		for(int i = 0; i < numproblems; i++) {
+			set[i] = getDefaultProblemId();
+		}
+		return set;
+	}
+	
+	/** 
+	 * Verifies that the given elements have problems and
+	 * only the given elements.
+	 */
+	protected void expectingOnlyProblemsFor(IPath[] expected) {
+		if (DEBUG) {
+			printProblems();
+		}
+		IMarker[] rootProblems = getEnv().getMarkers();
+		Hashtable<IPath, IPath> actual = new Hashtable<IPath, IPath>(rootProblems.length * 2 + 1);
+		for (int i = 0; i < rootProblems.length; i++) {
+			IPath culprit = rootProblems[i].getResource().getFullPath();
+			actual.put(culprit, culprit);
+		}
+
+		for (int i = 0; i < expected.length; i++)
+			if (!actual.containsKey(expected[i]))
+				assertTrue("missing expected problem with " + expected[i].toString(), false); //$NON-NLS-1$
+
+		if (actual.size() > expected.length) {
+			for (Enumeration<IPath> e = actual.elements(); e.hasMoreElements();) {
+				IPath path = e.nextElement();
+				boolean found = false;
+				for (int i = 0; i < expected.length; ++i) {
+					if (path.equals(expected[i])) {
+						found = true;
+						break;
+					}
+				}
+				if (!found)
+					assertTrue("unexpected problem(s) with " + path.toString(), false); //$NON-NLS-1$
+			}
+		}
+	}
+	
+	/**
+	 * Sets up the project for a given test using the specified source.
+	 * 
+	 * @param sourcename the name of the source file to create in the project
+	 * @param packagename the name of the package to create in the project in the default 'src' package
+	 * fragment root
+	 * 
+	 * @return the path to the new project
+	 */
+	protected IPath assertProject(String sourcename, String packagename) throws JavaModelException {
+		IPath ppath = getEnv().addProject(getTestingProjectName(), getTestCompliance());
+		assertTrue("The path for '"+getTestingProjectName()+"' must exist", !ppath.isEmpty());
+		IPath frpath = getEnv().addPackageFragmentRoot(ppath, SRC_ROOT);
+		assertTrue("The path for '"+SRC_ROOT+"' must exist", !frpath.isEmpty());
+		IPath packpath = getEnv().addPackage(frpath, packagename);
+		assertTrue("The path for '"+packagename+"' must exist", !packpath.isEmpty());
+		String contents = getSourceContents(getTestSourcePath(), sourcename);
+		assertNotNull("the source contents for '"+sourcename+"' must exist", contents);
+		IPath cpath = getEnv().addClass(packpath, sourcename, contents);
+		assertTrue("The path for '"+sourcename+"' must exist", !cpath.isEmpty());
+		return ppath;
+	}
+	
+	/**
+	 * Adds the given source to the given package with the specified project and returns the 
+	 * path the {@link IPackageFragment} the source was added to.
+	 * @param project the project to add to
+	 * @param packagename the package name to add the source to (will be created if it does not exist)
+	 * @param sourcename the name of the new source to add
+	 * @return the path to the {@link IPackageFragment} the source was added to
+	 * @throws JavaModelException
+	 */
+	protected IPath assertSource(IProject project, String packagename, String sourcename) throws JavaModelException {
+		IPath ppath = project.getFullPath();
+		assertTrue("The path for '"+project.getName()+"' must exist", !ppath.isEmpty());
+		IPath frpath = getEnv().addPackageFragmentRoot(ppath, SRC_ROOT);
+		assertTrue("The path for '"+SRC_ROOT+"' must exist", !frpath.isEmpty());
+		IPath packpath = getEnv().addPackage(frpath, packagename);
+		assertTrue("The path for '"+packagename+"' must exist", !packpath.isEmpty());
+		String contents = getSourceContents(getTestSourcePath(), sourcename);
+		assertNotNull("the source contents for '"+sourcename+"' must exist", contents);
+		IPath cpath = getEnv().addClass(packpath, sourcename, contents);
+		assertTrue("The path for '"+sourcename+"' must exist", !cpath.isEmpty());
+		return packpath;
+	}
+	
+	/**
+	 * Deploys a standard API usage test with the test project being created and the given source is imported in the testing project
+	 * into the given project.
+	 * 
+	 * This method assumes that the reference and testing project have been imported into the workspace already.
+	 * 
+	 * @param packagename
+	 * @param sourcename
+	 * @param expectingproblems
+	 * @param buildtype the type of build to perform. One of:
+	 * <ol>
+	 * <li>IncrementalProjectBuilder#FULL_BUILD</li>
+	 * <li>IncrementalProjectBuilder#INCREMENTAL_BUILD</li>
+	 * <li>IncrementalProjectBuilder#CLEAN_BUILD</li>
+	 * </ol>
+	 * @param buildworkspace
+	 */
+	protected void deployUsageTest(String packagename, String sourcename, boolean expectingproblems, int buildtype, boolean buildworkspace) {
+		try {
+			IProject project = getEnv().getProject(getTestingProjectName());
+			assertNotNull("the testing project "+getTestingProjectName()+" must be in the workspace", project);
+			assertSource(project, packagename, sourcename);
+			doBuild(buildtype, (buildworkspace ? null : project.getFullPath()));
+			IJavaProject jproject = getEnv().getJavaProject(getTestingProjectName());
+			IType type = jproject.findType(packagename, sourcename);
+			assertNotNull("The type "+sourcename+" from package "+packagename+" must exist", type);
+			IPath sourcepath = type.getPath();
+			if(expectingproblems) {
+				expectingOnlySpecificProblemsFor(sourcepath, getExpectedProblemIds());
+				assertProblems(getEnv().getProblems());
+			}
+			else {
+				expectingNoProblemsFor(sourcepath);
+			}
+		}
+		catch(Exception e) {
+			fail(e.getMessage());
+		}
+	}
+	
+	/**
+	 * Deploys a full build test for API Javadoc tags using the given source file in the specified package,
+	 * looking for problems specified from {@link #getExpectedProblemIds()()}
+	 * @param packagename
+	 * @param sourcename
+	 * @param expectingproblems
+	 * @param buildtype the type of build to perform. One of:
+	 * <ol>
+	 * <li>IncrementalProjectBuilder#FULL_BUILD</li>
+	 * <li>IncrementalProjectBuilder#INCREMENTAL_BUILD</li>
+	 * <li>IncrementalProjectBuilder#CLEAN_BUILD</li>
+	 * </ol>
+	 * @param buildworkspace true if the workspace should be built, false if the created project should be built
+	 */
+	protected void deployTagTest(String packagename, String sourcename, boolean expectingproblems, int buildtype, boolean buildworkspace) {
+		try {
+			IPath path = assertProject(sourcename, packagename);
+			doBuild(buildtype, (buildworkspace ? null : path));
+			IJavaProject jproject = getEnv().getJavaProject(path);
+			IType type = jproject.findType(packagename, sourcename);
+			assertNotNull("The type "+sourcename+" from package "+packagename+" must exist", type);
+			IPath sourcepath = type.getPath();
+			if(expectingproblems) {
+				expectingOnlySpecificProblemsFor(sourcepath, getExpectedProblemIds());
+				assertProblems(getEnv().getProblems());
+			}
+			else {
+				expectingNoProblemsFor(sourcepath);
+			}
+		}
+		catch(Exception e) {
+			fail(e.getMessage());
+		}
+	}
+	
+	/**
+	 * Sets up the project for a given test using the specified source.
+	 * The listing of source names and package names must be equal in size, as each source name will be
+	 * placed in the the corresponding package listed in packagenames
+	 * 
+	 * @param sourcenames listing of source names to deploy in the test project
+	 * @param packagenames listing of package name to deploy in the 'src' root of the project
+	 * @param internalpackages listing of the name of packages to make internal in the testing project (set x-internal to true)
+	 * 
+	 * @return the path to the new project
+	 */
+	protected IPath assertProject(String[] sourcenames, String[] packagenames, String[] internalpackages) throws JavaModelException, CoreException {
+		assertTrue("source and package name lists must be the same size", sourcenames.length == packagenames.length);
+		IPath ppath = getEnv().addProject(getTestingProjectName(), getTestCompliance());
+		assertTrue("The path for '"+getTestingProjectName()+"' must exist", !ppath.isEmpty());
+		IPath frpath = getEnv().addPackageFragmentRoot(ppath, SRC_ROOT);
+		assertTrue("The path for '"+SRC_ROOT+"' must exist", !frpath.isEmpty());
+		IProject project = getEnv().getProject(ppath);
+		for(int i = 0; i < sourcenames.length; i++) {
+			IPath packpath = getEnv().addPackage(frpath, packagenames[i]);
+			assertTrue("The path for '"+packagenames[i]+"' must exist", !packpath.isEmpty());
+			String contents = getSourceContents(getTestSourcePath(), sourcenames[i]);
+			assertNotNull("the source contents for '"+sourcenames[i]+"' must exist", contents);
+			IPath cpath = getEnv().addClass(packpath, sourcenames[i], contents);
+			assertTrue("The path for '"+sourcenames[i]+"' must exist", !cpath.isEmpty());
+			ProjectUtils.addExportedPackage(project, packagenames[i], false, null);
+		}
+		for(int i = 0; i < internalpackages.length; i++) {
+			IPackageFragment pack = getEnv().getJavaProject(ppath).findPackageFragment(getEnv().getPackagePath(frpath, internalpackages[i]));
+			if(pack != null) {
+				ProjectUtils.addExportedPackage(project, internalpackages[i], true, null);
+			}
+		}
+		return ppath;
+	}
+	
+	/**
+	 * Creates the workspace by importing projects from the 'projectsdir' directory. All projects in the given directory 
+	 * will try to be imported into the workspace. The given 'projectsdir' is assumed to be a child path
+	 * of the test source path (the test-builder folder in the test workspace).
+	 * 
+	 * This is the initial state of the workspace.
+	 *  
+	 * @param projectsdir the directory to load projects from
+	 * @param buildimmediately if a build should be run immediately following the import
+	 * @throws Exception
+	 */
+	protected void createExistingProjects(String projectsdir, boolean buildimmediately) throws Exception {
+		IPath path = TestSuiteHelper.getPluginDirectoryPath().append(TEST_SOURCE_ROOT).append(projectsdir);
+		File dir = path.toFile();
+		assertTrue("Test data directory does not exist: " + path.toOSString(), dir.exists());
+		File[] files = dir.listFiles();
+		for (int i = 0; i < files.length; i++) {
+			File file = files[i];
+			if (file.isDirectory() && !file.getName().equals("CVS")) {
+				createExistingProject(file);
+			}
+		}
+		if(buildimmediately) {
+			fullBuild();
+		}
+	}
+	
+	/**
+	 * Create the project described in record. If it is successful return true.
+	 * 
+	 * @param projectDir directory containing existing project
+	 */
+	private void createExistingProject(File projectDir) throws Exception {
+		String projectName = projectDir.getName();
+		final IWorkspace workspace = getEnv().getWorkspace();
+		IPath ppath = getEnv().addProject(projectName, getTestCompliance());
+		final IProject project = getEnv().getProject(ppath);
+		IProjectDescription description = workspace.newProjectDescription(projectName);
+		IPath locationPath = new Path(projectDir.getAbsolutePath());
+		description.setLocation(locationPath);
+		
+		// import from file system
+		File importSource = null;
+		// import project from location copying files - use default project
+		// location for this workspace
+		URI locationURI = description.getLocationURI();
+		// if location is null, project already exists in this location or
+		// some error condition occurred.
+		assertNotNull("project description location is null", locationURI);
+		importSource = new File(locationURI);
+		
+		IProjectDescription desc = workspace.newProjectDescription(projectName);
+		desc.setBuildSpec(description.getBuildSpec());
+		desc.setComment(description.getComment());
+		desc.setDynamicReferences(description.getDynamicReferences());
+		desc.setNatureIds(description.getNatureIds());
+		desc.setReferencedProjects(description.getReferencedProjects());
+		description = desc;
+
+		project.setDescription(description, new NullProgressMonitor());
+		project.open(null);
+		
+		// import operation to import project files
+		List filesToImport = FileSystemStructureProvider.INSTANCE.getChildren(importSource);
+		ImportOperation operation = new ImportOperation(
+				project.getFullPath(), importSource,
+				FileSystemStructureProvider.INSTANCE, new IOverwriteQuery() {
+					public String queryOverwrite(String pathString) {
+						return IOverwriteQuery.ALL;
+					}
+				}, filesToImport);
+		operation.setOverwriteResources(true);
+		operation.setCreateContainerStructure(false);
+		operation.run(new NullProgressMonitor());
+	}
+	
+	/**
+	 * Performs the specified type of build on the given path, or the workspace if the path is <code>null</code>
+	 * @param type the type of build. One of:
+	 * <ol>
+	 * <li>IncrementalProjectBuilder#FULL_BUILD</li>
+	 * <li>IncrementalProjectBuilder#INCREMENTAL_BUILD</li>
+	 * <li>IncrementalProjectBuilder#CLEAN_BUILD</li>
+	 * </ol>
+	 * @param path the path of the project to build or <code>null</code> if the workspace should be built
+	 */
+	private void doBuild(int type, IPath path) {
+		switch(type) {
+			case IncrementalProjectBuilder.FULL_BUILD: {
+				if(path == null) {
+					fullBuild();
+				}
+				else {
+					fullBuild(path);
+				}
+				break;
+			}
+			case IncrementalProjectBuilder.INCREMENTAL_BUILD: {
+				if(path == null) {
+					incrementalBuild();
+				}
+				else {
+					incrementalBuild(path);
+				}
+				break;
+			}
+			case IncrementalProjectBuilder.CLEAN_BUILD: {
+				cleanBuild();
+				break;
+			}
+		}
+	}
+	
+	/**
+	 * Deploys a full build with the given package and source names, where: 
+	 * <ol>
+	 * <li>the listing of internal package names will set all those packages that exist to be x-internal=true in the manifest</li>
+	 * <li>the listing of fully qualified type names will each be checked for set expected problem id</li>
+	 * <li>all other packages specified in packagenames that do not appear in internalpnames will be set to exported</li>
+	 * </ol>
+	 * @param packagenames the names of the packages to create in the testing project
+	 * @param sourcenames the names of the source files to create in the testing project. Each source will be placed in the 
+	 * corresponding package from the packagnames array, i.e. sourcenames[0] will be placed in packagenames[0]
+	 * @param internalpnames the names of packages to mark as x-internal=true in the manifest of the project
+	 * @param expectingproblemson the fully qualified names of the types we are expecting to see problems on
+	 * @param expectingproblems the problem ids we expect to see on each of the types specified in the expectingproblemson array
+	 * @param buildtype the type of build to run. One of:
+	 * <ol>
+	 * <li>IncrementalProjectBuilder#FULL_BUILD</li>
+	 * <li>IncrementalProjectBuilder#INCREMENTAL_BUILD</li>
+	 * <li>IncrementalProjectBuilder#CLEAN_BUILD</li>
+	 * </ol>
+	 * @param buildworkspace true if the entire workspace should be built, false if only the created project should be built
+	 */
+	protected void deployLeakTest(String[] packagenames, String[] sourcenames, String[] internalpnames, String[] expectingproblemson, boolean expectingproblems, int buildtype, boolean buildworkspace) {
+		try {
+			IPath path = assertProject(sourcenames, packagenames, internalpnames);
+			doBuild(buildtype, (buildworkspace ? null : path));
+			if(expectingproblems || expectingproblemson != null) {
+				IJavaProject jproject = getEnv().getJavaProject(path);
+				for(int i = 0; i < expectingproblemson.length; i++) {
+					IType type = jproject.findType(expectingproblemson[i]);
+					assertNotNull("The type "+expectingproblemson[i]+" must exist", type);
+					expectingOnlySpecificProblemsFor(type.getPath(), getExpectedProblemIds());
+				}
+				assertProblems(getEnv().getProblems());
+			}
+			else {
+				expectingNoProblems();
+			}
+		}
+		catch(Exception e) {
+			fail(e.getMessage());
+		}
+	}
+	
+	/**
+	 * @return the default compiler compliance to use for the test
+	 */
+	protected String getTestCompliance() {
+		return CompilerOptions.VERSION_1_4;
+	}
+	
+	/**
+	 * Method that can be overridden for custom assertion of the problems after the build
+	 * @param problems the complete listing of problems from the testing environment
+	 */
+	protected void assertProblems(ApiProblem[] problems) {}
+	
+	/**
+	 * Sets the ids of the problems you expect to see from deploying a builder test
+	 * @param problemids
+	 */
+	protected void setExpectedProblemIds(int[] problemids) {
+		fProblems = problemids;
+	}
+	
+	/**
+	 * Sets the message arguments for corresponding problem ids.
+	 * 
+	 * @param messageArgs message arguments - an array of String for each expected problem.
+	 */
+	protected void setExpectedMessageArgs(String[][] messageArgs) {
+		fMessageArgs = messageArgs;
+	}
+	
+	/**
+	 * @return the name of the testing project for the implementing test suite 
+	 */
+	protected abstract String getTestingProjectName();
+	
+	/**
+	 * @return the default problem id for the given test
+	 */
+	protected abstract int getDefaultProblemId();
+	
+	/**
+	 * @return the ids of the {@link org.eclipse.pde.api.tools.internal.provisional.problems.IApiProblem} we are
+	 * expecting to find after a build. 
+	 * 
+	 * This method is consulted for every call to a deploy* method where a builder test is run.
+	 * 
+	 * The returned array from this method is used to make sure that expected problems (kind and count) appear after a build
+	 */
+	protected int[] getExpectedProblemIds() {
+		if(fProblems == null) {
+			return NO_PROBLEM_IDS;
+		}
+		return fProblems;
+	}
+	
+	/**
+	 * Returns the expected message arguments corresponding to expected problem ids, 
+	 * or <code>null</code> if unspecified.
+	 * 
+	 * @return message arguments for each expected problem or <code>null</code> if unspecified
+	 */
+	protected String[][] getExpectedMessageArgs() {
+		return fMessageArgs;
+	}
+	
+	/** 
+	 * Verifies that the given element has a specific problem and
+	 * only the given problem.
+	 */
+	protected void expectingOnlySpecificProblemFor(IPath root, int problemid) {
+		expectingOnlySpecificProblemsFor(root, new int[] { problemid });
+	}
+
+	/**
+	 * Returns the problem id from the marker
+	 * @param marker
+	 * @return the problem id from the marker or -1 if there isn't one set on the marker
+	 */
+	protected int getProblemId(IMarker marker) {
+		if(marker == null) {
+			return -1;
+		}
+		return marker.getAttribute(IApiMarkerConstants.MARKER_ATTR_PROBLEM_ID, -1);
+	}
+	
+	/** 
+	 * Verifies that the given element has specifics problems and
+	 * only the given problems.
+	 */
+	protected void expectingOnlySpecificProblemsFor(final IPath root, final int[] problemids) {
+		if (DEBUG) {
+			printProblemsFor(root);
+		}
+		IMarker[] markers = getEnv().getMarkersFor(root);
+		for (int i = 0; i < problemids.length; i++) {
+			boolean found = false;
+			for (int j = 0; j < markers.length; j++) {
+				if(getProblemId(markers[j]) == problemids[i]) {
+					found = true;
+					markers[j] = null;
+					break;
+				}
+			}
+			if (!found) {
+				printProblemsFor(root);
+			}
+			assertTrue("problem not found: " + problemids[i], found); //$NON-NLS-1$
+		}
+		for (int i = 0; i < markers.length; i++) {
+			if(markers[i] != null) {
+				printProblemsFor(root);
+				assertTrue("unexpected problem: " + markers[i].toString(), false); //$NON-NLS-1$
+			}
+		}
+	}
+
+	/** 
+	 * Verifies that the given element has problems.
+	 */
+	protected void expectingProblemsFor(IPath root, String expected) {
+		expectingProblemsFor(new IPath[] { root }, expected);
+	}
+
+	/** 
+	 * Verifies that the given elements have problems.
+	 */
+	protected void expectingProblemsFor(IPath[] roots, String expected) {
+		ApiProblem[] problems = allSortedApiProblems(roots);
+		assumeEquals("Invalid problem(s)!!!", expected, arrayToString(problems)); //$NON-NLS-1$
+	}
+
+	/**
+	 * Verifies that the given elements have the expected problems.
+	 */
+	protected void expectingProblemsFor(IPath[] roots, List expected) {
+		ApiProblem[] problems = allSortedApiProblems(roots);
+		assumeEquals("Invalid problem(s)!!!", arrayToString(expected.toArray()), arrayToString(problems));
+	}
+
+	/**
+	 * Concatenate and sort all problems for given root paths.
+	 *
+	 * @param roots The path to get the problems
+	 * @return All sorted problems of all given path
+	 */
+	protected ApiProblem[] allSortedApiProblems(IPath[] roots) {
+		ApiProblem[] allProblems = null;
+		ApiProblem[] problems = null;
+		for (int i = 0, max=roots.length; i<max; i++) {
+			problems = (ApiProblem[]) getEnv().getProblemsFor(roots[i]);
+			int length = problems.length;
+			if (problems.length != 0) {
+				if (allProblems == null) {
+					allProblems = problems;
+				} else {
+					int all = allProblems.length;
+					System.arraycopy(allProblems, 0, allProblems = new ApiProblem[all+length], 0, all);
+					System.arraycopy(problems, 0, allProblems , all, length);
+				}
+			}
+		}
+		if (allProblems != null) {
+			Arrays.sort(allProblems);
+		}
+		return allProblems;
+	}
+	
+	/** 
+	 * Verifies that the given element has a specific problem.
+	 */
+	protected void expectingSpecificProblemFor(IPath root, int problemid) {
+		expectingSpecificProblemsFor(root, new int[] { problemid });
+	}
+
+	/** 
+	 * Verifies that the given element has specific problems.
+	 */
+	protected void expectingSpecificProblemsFor(IPath root, int[] problemids) {
+		if (DEBUG) {
+			printProblemsFor(root);
+		}
+		IMarker[] markers = getEnv().getMarkersFor(root);
+		IMarker marker = null;
+		next : for (int i = 0; i < problemids.length; i++) {
+			for (int j = 0; j < markers.length; j++) {
+				marker = markers[j];
+				if (marker != null) {
+					if (problemids[i] == getProblemId(marker)) {
+						markers[j] = null;
+						continue next;
+					}
+				}
+			}
+			System.out.println("--------------------------------------------------------------------------------");
+			System.out.println("Missing problem while running test "+getName()+":");
+			System.out.println("	- expected : " + problemids[i]);
+			System.out.println("	- current: " + arrayToString(markers));
+			assumeTrue("missing expected problem: " + problemids[i], false);
+		}
+	}
+
+	/**
+	 * Prints all of the problems in the current test workspace
+	 */
+	protected void printProblems() {
+		printProblemsFor(getEnv().getWorkspaceRootPath());
+	}
+
+	/**
+	 * Prints all of the problems from the current root to infinite children
+	 * @param root
+	 */
+	protected void printProblemsFor(IPath root) {
+		printProblemsFor(new IPath[] { root });
+	}
+
+	/**
+	 * Prints all of the problems from each of the roots to infinite children
+	 * @param roots
+	 */
+	protected void printProblemsFor(IPath[] roots) {
+		for (int i = 0; i < roots.length; i++) {
+			/* get the leaf problems for this type */
+			System.out.println(arrayToString(getEnv().getProblemsFor(roots[i])));
+			System.out.println();
+		}
+	}
+
+	/**
+	 * Takes each element of the array and calls toString on it to put an array together as a string
+	 * @param array
+	 * @return
+	 */
+	protected String arrayToString(Object[] array) {
+		StringBuffer buffer = new StringBuffer();
+		int length = array == null ? 0 : array.length;
+		for (int i = 0; i < length; i++) {
+			if (array[i] != null) {
+				if (i > 0) buffer.append('\n');
+				buffer.append(array[i].toString());
+			}
+		}
+		return buffer.toString();
+	}
+
+	/**
+	 * @return the source path from the test-builder test source root to find the test source in
+	 */
+	protected abstract IPath getTestSourcePath();
+	
+	/**
+	 * Sets the current builder options to use for the current test.
+	 * Default is all set to their default values
+	 */
+	protected void setBuilderOptions() {
+		resetBuilderOptions();
+	}
+	
+	/**
+	 * Resets all of the builder options to their defaults after each test run
+	 */
+	private void resetBuilderOptions() {
+		Preferences prefs = ApiPlugin.getDefault().getPluginPreferences();
+		// usage
+		prefs.setToDefault(IApiProblemTypes.ILLEGAL_EXTEND);
+		prefs.setToDefault(IApiProblemTypes.ILLEGAL_IMPLEMENT);
+		prefs.setToDefault(IApiProblemTypes.ILLEGAL_INSTANTIATE);
+		prefs.setToDefault(IApiProblemTypes.ILLEGAL_REFERENCE);
+		prefs.setToDefault(IApiProblemTypes.ILLEGAL_OVERRIDE);
+		prefs.setToDefault(IApiProblemTypes.LEAK_EXTEND);
+		prefs.setToDefault(IApiProblemTypes.LEAK_FIELD_DECL);
+		prefs.setToDefault(IApiProblemTypes.LEAK_IMPLEMENT);
+		prefs.setToDefault(IApiProblemTypes.LEAK_METHOD_PARAM);
+		prefs.setToDefault(IApiProblemTypes.LEAK_METHOD_RETURN_TYPE);
+		prefs.setToDefault(IApiProblemTypes.INVALID_JAVADOC_TAG);
+		
+		// compatibilities
+		for (int i = 0, max = ApiPlugin.AllCompatibilityKeys.length; i < max; i++) {
+			prefs.setToDefault(ApiPlugin.AllCompatibilityKeys[i]);
+		}
+	
+		// version management
+		prefs.setToDefault(IApiProblemTypes.MISSING_SINCE_TAG);
+		prefs.setToDefault(IApiProblemTypes.MALFORMED_SINCE_TAG);
+		prefs.setToDefault(IApiProblemTypes.INVALID_SINCE_TAG_VERSION);
+		prefs.setToDefault(IApiProblemTypes.INCOMPATIBLE_API_COMPONENT_VERSION);
+		prefs.setToDefault(IApiProblemTypes.INCOMPATIBLE_API_COMPONENT_VERSION_INCLUDE_INCLUDE_MINOR_WITHOUT_API_CHANGE);
+		prefs.setToDefault(IApiProblemTypes.INCOMPATIBLE_API_COMPONENT_VERSION_INCLUDE_INCLUDE_MAJOR_WITHOUT_BREAKING_CHANGE);
+		
+		prefs.setToDefault(IApiProblemTypes.MISSING_DEFAULT_API_BASELINE);
+		ApiPlugin.getDefault().savePluginPreferences();
+	}
+	
+	/**
+	 * Enables or disables all of the usage problems for the builder
+	 * @param enabled if true the builder options are set to 'Error', false sets the 
+	 * options to 'Ignore'
+	 */
+	protected void enableUsageOptions(boolean enabled) {
+		Preferences prefs = ApiPlugin.getDefault().getPluginPreferences();
+		String value = enabled ? ApiPlugin.VALUE_ERROR : ApiPlugin.VALUE_IGNORE;
+		prefs.setValue(IApiProblemTypes.ILLEGAL_EXTEND, value);
+		prefs.setValue(IApiProblemTypes.ILLEGAL_IMPLEMENT, value);
+		prefs.setValue(IApiProblemTypes.ILLEGAL_INSTANTIATE, value);
+		prefs.setValue(IApiProblemTypes.ILLEGAL_REFERENCE, value);
+		prefs.setValue(IApiProblemTypes.ILLEGAL_OVERRIDE, value);
+		ApiPlugin.getDefault().savePluginPreferences();
+	}
+	
+	/**
+	 * Enables or disables all of the leak problems for the builder
+	 * @param enabled if true the builder options are set to 'Error', false sets the 
+	 * options to 'Ignore'
+	 */
+	protected void enableLeakOptions(boolean enabled) {
+		Preferences prefs = ApiPlugin.getDefault().getPluginPreferences();
+		String value = enabled ? ApiPlugin.VALUE_ERROR : ApiPlugin.VALUE_IGNORE;
+		prefs.setValue(IApiProblemTypes.LEAK_EXTEND, value);
+		prefs.setValue(IApiProblemTypes.LEAK_FIELD_DECL, value);
+		prefs.setValue(IApiProblemTypes.LEAK_IMPLEMENT, value);
+		prefs.setValue(IApiProblemTypes.LEAK_METHOD_PARAM, value);
+		prefs.setValue(IApiProblemTypes.LEAK_METHOD_RETURN_TYPE, value);
+		ApiPlugin.getDefault().savePluginPreferences();
+	}
+	
+	/**
+	 * Enables or disables the unsupported Javadoc tag problems for the builder
+	 * @param enabled if true the builder options are set to 'Error', false sets the 
+	 * options to 'Ignore'
+	 */
+	protected void enableUnsupportedTagOptions(boolean enabled) {
+		Preferences prefs = ApiPlugin.getDefault().getPluginPreferences();
+		prefs.setValue(IApiProblemTypes.INVALID_JAVADOC_TAG, enabled ? ApiPlugin.VALUE_ERROR : ApiPlugin.VALUE_IGNORE);
+		ApiPlugin.getDefault().savePluginPreferences();
+	}
+	
+	/**
+	 * Enables or disables all of the compatibility problems for the builder
+	 * @param enabled if true the builder options are set to 'Error', false sets the 
+	 * options to 'Ignore'
+	 */
+	protected void enableCompatibilityOptions(boolean enabled) {
+		Preferences prefs = ApiPlugin.getDefault().getPluginPreferences();
+		String value = enabled ? ApiPlugin.VALUE_ERROR : ApiPlugin.VALUE_IGNORE;
+		for (int i = 0, max = ApiPlugin.AllCompatibilityKeys.length; i < max; i++) {
+			prefs.setValue(ApiPlugin.AllCompatibilityKeys[i], value);
+		}
+		ApiPlugin.getDefault().savePluginPreferences();
+	}
+	
+	/**
+	 * Enables or disables all of the since tag problems for the builder
+	 * @param enabled if true the builder options are set to 'Error', false sets the 
+	 * options to 'Ignore'
+	 */
+	protected void enableSinceTagOptions(boolean enabled) {
+		Preferences prefs = ApiPlugin.getDefault().getPluginPreferences();
+		String value = enabled ? ApiPlugin.VALUE_ERROR : ApiPlugin.VALUE_IGNORE;
+		prefs.setValue(IApiProblemTypes.MISSING_SINCE_TAG, value);
+		prefs.setValue(IApiProblemTypes.MALFORMED_SINCE_TAG, value);
+		prefs.setValue(IApiProblemTypes.INVALID_SINCE_TAG_VERSION, value);
+		ApiPlugin.getDefault().savePluginPreferences();
+	}
+	
+	/**
+	 * Enables or disables all of the version number problems for the builder
+	 * @param enabled if true the builder options are set to 'Error' or 'Enabled', false sets the 
+	 * options to 'Ignore' or 'Disabled'
+	 */
+	protected void enableVersionNumberOptions(boolean enabled) {
+		Preferences prefs = ApiPlugin.getDefault().getPluginPreferences();
+		String value = enabled ? ApiPlugin.VALUE_ERROR : ApiPlugin.VALUE_IGNORE;
+		String value2 = enabled ? ApiPlugin.VALUE_ENABLED : ApiPlugin.VALUE_DISABLED;
+		prefs.setValue(IApiProblemTypes.INCOMPATIBLE_API_COMPONENT_VERSION, value);
+		prefs.setValue(IApiProblemTypes.INCOMPATIBLE_API_COMPONENT_VERSION_INCLUDE_INCLUDE_MINOR_WITHOUT_API_CHANGE, value2);
+		prefs.setValue(IApiProblemTypes.INCOMPATIBLE_API_COMPONENT_VERSION_INCLUDE_INCLUDE_MAJOR_WITHOUT_BREAKING_CHANGE, value2);
+		ApiPlugin.getDefault().savePluginPreferences();
+	}
+	
+	/**
+	 * Enables or disables the API baseline problems for the builder
+	 * @param enabled if true the builder options are set to 'Error', false sets the 
+	 * options to 'Ignore'
+	 */
+	protected void enableBaselineOptions(boolean enabled) {
+		Preferences prefs = ApiPlugin.getDefault().getPluginPreferences();
+		String value = enabled ? ApiPlugin.VALUE_ERROR : ApiPlugin.VALUE_IGNORE;
+		prefs.setValue(IApiProblemTypes.MISSING_DEFAULT_API_BASELINE, value);
+		ApiPlugin.getDefault().savePluginPreferences();
+	}
+	
+	/** 
+	 * Sets up this test.
+	 */
+	protected void setUp() throws Exception {
+		if (env == null) {
+			env = new ApiTestingEnvironment();
+			env.openEmptyWorkspace();
+		}
+		setBuilderOptions();
+		super.setUp();
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.jdt.core.tests.builder.BuilderTests#tearDown()
+	 */
+	protected void tearDown() throws Exception {
+		resetBuilderOptions();
+		fProblems = null;
+		fMessageArgs = null;
+		super.tearDown();
+	}
+	
+	/**
+	 * @return all of the child test classes of this class
+	 */
+	private static Class[] getAllTestClasses() {
+		Class[] classes = new Class[] {
+		};
+		return classes;
+	}
+
+	/**
+	 * Collects tests from the getAllTestClasses() method into the given suite
+	 * @param suite
+	 */
+	private static void collectTests(TestSuite suite) {
+		// Hack to load all classes before computing their suite of test cases
+		// this allow to reset test cases subsets while running all Builder tests...
+		Class[] classes = getAllTestClasses();
+
+		// Reset forgotten subsets of tests
+		TestCase.TESTS_PREFIX = null;
+		TestCase.TESTS_NAMES = null;
+		TestCase.TESTS_NUMBERS = null;
+		TestCase.TESTS_RANGE = null;
+		TestCase.RUN_ONLY_ID = null;
+
+		/* tests */
+		for (int i = 0, length = classes.length; i < length; i++) {
+			Class clazz = classes[i];
+			Method suiteMethod;
+			try {
+				suiteMethod = clazz.getDeclaredMethod("suite", new Class[0]);
+			} catch (NoSuchMethodException e) {
+				e.printStackTrace();
+				continue;
+			}
+			Object test;
+			try {
+				test = suiteMethod.invoke(clazz, new Object[0]);
+			} catch (IllegalAccessException e) {
+				e.printStackTrace();
+				continue;
+			} catch (InvocationTargetException e) {
+				e.printStackTrace();
+				continue;
+			}
+			suite.addTest((Test) test);
+		}
+	}
+	
+	/**
+	 * loads builder tests
+	 * @return
+	 */
+	public static Test suite() {
+		TestSuite suite = new TestSuite(ApiBuilderTest.class.getName());
+		collectTests(suite);
+		return suite;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/ApiTestingEnvironment.java b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/ApiTestingEnvironment.java
index ca35820e3c..84d2659a1d 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/ApiTestingEnvironment.java
+++ b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/ApiTestingEnvironment.java
@@ -20,6 +20,7 @@ import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.tests.builder.TestingEnvironment;
@@ -244,4 +245,21 @@ public class ApiTestingEnvironment extends TestingEnvironment {
 		}
 		return (ApiProblem[]) problems.toArray(new ApiProblem[problems.size()]);
 	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.jdt.core.tests.builder.TestingEnvironment#resetWorkspace()
+	 */
+	public void resetWorkspace() {
+		super.resetWorkspace();
+		//clean up any left over projects from other tests
+		IProject[] projects = getWorkspace().getRoot().getProjects();
+		for(int i = 0; i < projects.length; i++) {
+			try {
+				projects[i].delete(true, new NullProgressMonitor());
+			}
+			catch(CoreException ce) {
+				
+			}
+		}
+	}	
 }
diff --git a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/performance/ApiDescriptionTests.java b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/performance/ApiDescriptionTests.java
new file mode 100644
index 0000000000..a0bbfd236a
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/performance/ApiDescriptionTests.java
@@ -0,0 +1,89 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.pde.api.tools.builder.tests.performance;
+
+import junit.framework.Test;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
+import org.eclipse.pde.api.tools.internal.provisional.ApiDescriptionVisitor;
+import org.eclipse.pde.api.tools.internal.provisional.ApiPlugin;
+import org.eclipse.pde.api.tools.internal.provisional.IApiComponent;
+import org.eclipse.pde.api.tools.internal.provisional.IApiProfile;
+import org.eclipse.pde.api.tools.model.tests.TestSuiteHelper;
+import org.eclipse.test.performance.Dimension;
+
+/**
+ * Performance tests for API descriptions
+ * 
+ * @since 1.0
+ */
+public class ApiDescriptionTests extends PerformanceTest {
+	
+	/**
+	 * Constructor
+	 * @param name
+	 */
+	public ApiDescriptionTests(String name) {
+		super(name);
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.pde.api.tools.builder.tests.performance.PerformanceTest#getWorkspaceLocation()
+	 */
+	protected String getWorkspaceLocation() {
+		return TestSuiteHelper.getPluginDirectoryPath().append(TEST_SOURCE_ROOT).append("perf").append("jdtui-source.zip").toOSString();
+	}
+	
+	/**
+	 * @return the tests for this class
+	 */
+	public static Test suite() {
+		return buildTestSuite(ApiDescriptionTests.class);
+	}
+	
+	/**
+	 * Tests a clean and visit jdt-ui source project. Populates the entire API description.
+	 * 
+	 * @throws Exception
+	 */
+	public void testCleanVisit() throws Exception {
+		tagAsGlobalSummary("Build API description from source tags", Dimension.ELAPSED_PROCESS);
+		
+		// WARM-UP
+		IProject proj = getEnv().getWorkspace().getRoot().getProject("org.eclipse.jdt.ui");	
+		ApiDescriptionVisitor visitor = new ApiDescriptionVisitor();
+		for (int j = 0; j < 2; j++) {
+			// *** clean & visit API description ***
+			proj.build(IncrementalProjectBuilder.CLEAN_BUILD, ApiPlugin.BUILDER_ID, null, null);
+			IApiProfile profile = ApiPlugin.getDefault().getApiProfileManager().getWorkspaceProfile();
+			IApiComponent component = profile.getApiComponent(proj.getName());
+			component.getApiDescription().accept(visitor);
+		}
+		
+		// TEST
+		for (int j = 0; j < 15; j++) {
+			
+			// *** clean API description ***
+			proj.build(IncrementalProjectBuilder.CLEAN_BUILD, ApiPlugin.BUILDER_ID, null, null);
+			IApiProfile profile = ApiPlugin.getDefault().getApiProfileManager().getWorkspaceProfile();
+			IApiComponent component = profile.getApiComponent(proj.getName());
+				
+			// ** Visit API description ***
+			startMeasuring();
+			component.getApiDescription().accept(visitor);
+			stopMeasuring();
+		}
+		
+		commitMeasurements();
+		assertPerformance();
+	}	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/performance/FullSourceBuildTests.java b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/performance/FullSourceBuildTests.java
new file mode 100644
index 0000000000..d3e4cacc1e
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/performance/FullSourceBuildTests.java
@@ -0,0 +1,150 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.pde.api.tools.builder.tests.performance;
+
+import junit.framework.Test;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.pde.api.tools.internal.provisional.ApiPlugin;
+import org.eclipse.pde.api.tools.model.tests.TestSuiteHelper;
+import org.eclipse.test.performance.Dimension;
+
+/**
+ * Performance tests for full source workspace build
+ * 
+ * @since 1.0
+ */
+public class FullSourceBuildTests extends PerformanceTest {	
+
+	/**
+	 * Constructor
+	 * @param name
+	 */
+	public FullSourceBuildTests(String name) {
+		super(name);
+	}
+	
+	/**
+	 * @return the tests for this class
+	 */
+	public static Test suite() {
+		return buildTestSuite(FullSourceBuildTests.class);
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.pde.api.tools.builder.tests.performance.PerformanceTest#getBaselineLocation()
+	 */
+	protected String getBaselineLocation() {
+		return TestSuiteHelper.getPluginDirectoryPath().append(TEST_SOURCE_ROOT).append("perf").append("bin-baseline.zip").toOSString();
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.pde.api.tools.builder.tests.performance.PerformanceTest#getWorkspaceLocation()
+	 */
+	protected String getWorkspaceLocation() {
+		return TestSuiteHelper.getPluginDirectoryPath().append(TEST_SOURCE_ROOT).append("perf").append("source-ws.zip").toOSString();
+	}	
+	
+	/**
+	 * Tests a full build of a 3.4 workspace with source from debug.core and pre-reqs
+	 * against a baseline of 3.3 binary plug-ins.
+	 * 
+	 * @throws Exception
+	 */
+	public void testFullBuild() throws Exception {
+		tagAsGlobalSummary("Full Build", Dimension.ELAPSED_PROCESS);
+		
+		// get everything built
+		fullBuild();
+		IProject[] ps = getEnv().getWorkspace().getRoot().getProjects();
+		IJavaProject[] projects = new IJavaProject[ps.length];
+		for (int i = 0; i < ps.length; i++) {
+			projects[i] = JavaCore.create(ps[i]);
+		}
+		IWorkspace.ProjectOrder po = ResourcesPlugin.getWorkspace().computeProjectOrder(ps);
+		IProject[] order = po.projects;
+		
+		// WARM-UP
+		for (int j = 0; j < 2; j++) {
+			// *** build each project ***
+			for (int i = 0; i < order.length; i++) {
+				order[i].build(IncrementalProjectBuilder.FULL_BUILD, ApiPlugin.BUILDER_ID, null, null);
+			}
+		}
+		
+		// TEST
+		for (int j = 0; j < 15; j++) {
+			startMeasuring();
+			
+			// *** build each project ***
+			for (int i = 0; i < order.length; i++) {
+				order[i].build(IncrementalProjectBuilder.FULL_BUILD, ApiPlugin.BUILDER_ID, null, null);
+			}
+			
+			stopMeasuring();
+		}
+		
+		commitMeasurements();
+		assertPerformance();
+	}
+	
+	/**
+	 * Tests a clean and full build of a 3.4 workspace with source from debug.core and pre-reqs
+	 * against a baseline of 3.3 binary plug-ins.
+	 * 
+	 * @throws Exception
+	 */
+	public void testCleanFullBuild() throws Exception {
+		tagAsGlobalSummary("Clean & Full Build", Dimension.ELAPSED_PROCESS);
+		
+		// get everything built
+		fullBuild();
+		IProject[] ps = getEnv().getWorkspace().getRoot().getProjects();
+		IJavaProject[] projects = new IJavaProject[ps.length];
+		for (int i = 0; i < ps.length; i++) {
+			projects[i] = JavaCore.create(ps[i]);
+		}
+		IWorkspace.ProjectOrder po = ResourcesPlugin.getWorkspace().computeProjectOrder(ps);
+		IProject[] order = po.projects;
+
+		// WARM-UP
+		for (int j = 0; j < 2; j++) {
+			// *** build each project ***
+			for (int i = 0; i < order.length; i++) {
+				order[i].build(IncrementalProjectBuilder.CLEAN_BUILD, ApiPlugin.BUILDER_ID, null, null);
+				order[i].build(IncrementalProjectBuilder.FULL_BUILD, ApiPlugin.BUILDER_ID, null, null);
+			}
+		}
+		
+		// TEST
+		for (int j = 0; j < 15; j++) {
+			startMeasuring();
+			
+			// *** build each project ***
+			for (int i = 0; i < order.length; i++) {
+				order[i].build(IncrementalProjectBuilder.CLEAN_BUILD, ApiPlugin.BUILDER_ID, null, null);
+				order[i].build(IncrementalProjectBuilder.FULL_BUILD, ApiPlugin.BUILDER_ID, null, null);
+			}
+			
+			stopMeasuring();
+		}
+		
+		commitMeasurements();
+		assertPerformance();
+	}	
+	
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/performance/PerformanceTest.java b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/performance/PerformanceTest.java
new file mode 100644
index 0000000000..5c5773909e
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/builder/tests/performance/PerformanceTest.java
@@ -0,0 +1,531 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.pde.api.tools.builder.tests.performance;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.URI;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.jar.JarFile;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.jdt.core.tests.junit.extension.TestCase;
+import org.eclipse.jdt.core.tests.util.Util;
+import org.eclipse.pde.api.tools.builder.tests.ApiBuilderTest;
+import org.eclipse.pde.api.tools.builder.tests.ApiProblem;
+import org.eclipse.pde.api.tools.internal.problems.ApiProblemFactory;
+import org.eclipse.pde.api.tools.internal.provisional.ApiPlugin;
+import org.eclipse.pde.api.tools.internal.provisional.Factory;
+import org.eclipse.pde.api.tools.internal.provisional.IApiComponent;
+import org.eclipse.pde.api.tools.internal.provisional.IApiProfile;
+import org.eclipse.pde.api.tools.internal.provisional.IApiProfileManager;
+import org.eclipse.pde.api.tools.model.tests.TestSuiteHelper;
+import org.eclipse.pde.api.tools.tests.ApiTestsPlugin;
+import org.eclipse.ui.dialogs.IOverwriteQuery;
+import org.eclipse.ui.wizards.datatransfer.FileSystemStructureProvider;
+import org.eclipse.ui.wizards.datatransfer.ImportOperation;
+
+/**
+ * Base class for performance tests
+ * 
+ * @since 1.0
+ */
+public abstract class PerformanceTest extends ApiBuilderTest {	
+
+	/**
+	 * Constructor
+	 * @param name
+	 */
+	public PerformanceTest(String name) {
+		super(name);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.pde.api.tools.builder.tests.ApiBuilderTests#getTestSourcePath()
+	 */
+	protected IPath getTestSourcePath() {
+		return new Path("compat");
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.pde.api.tools.builder.tests.ApiBuilderTests#setBuilderOptions()
+	 */
+	protected void setBuilderOptions() {
+		enableUnsupportedTagOptions(true);
+		enableBaselineOptions(true);
+		enableCompatibilityOptions(true);
+		enableLeakOptions(true);
+		enableSinceTagOptions(true);
+		enableUsageOptions(true);
+		enableVersionNumberOptions(true);
+	}
+	
+	/**
+	 * @return all of the child test classes of this class
+	 */
+	private static Class[] getAllTestClasses() {
+		Class[] classes = new Class[] {
+			FullSourceBuildTests.class,
+			ApiDescriptionTests.class
+		};
+		return classes;
+	}
+	
+	/**
+	 * Collects tests from the getAllTestClasses() method into the given suite
+	 * @param suite
+	 */
+	private static void collectTests(TestSuite suite) {
+		// Hack to load all classes before computing their suite of test cases
+		// this allow to reset test cases subsets while running all Builder tests...
+		Class[] classes = getAllTestClasses();
+
+		// Reset forgotten subsets of tests
+		TestCase.TESTS_PREFIX = null;
+		TestCase.TESTS_NAMES = null;
+		TestCase.TESTS_NUMBERS = null;
+		TestCase.TESTS_RANGE = null;
+		TestCase.RUN_ONLY_ID = null;
+
+		/* tests */
+		for (int i = 0, length = classes.length; i < length; i++) {
+			Class clazz = classes[i];
+			Method suiteMethod;
+			try {
+				suiteMethod = clazz.getDeclaredMethod("suite", new Class[0]);
+			} catch (NoSuchMethodException e) {
+				e.printStackTrace();
+				continue;
+			}
+			Object test;
+			try {
+				test = suiteMethod.invoke(null, new Object[0]);
+			} catch (IllegalAccessException e) {
+				e.printStackTrace();
+				continue;
+			} catch (InvocationTargetException e) {
+				e.printStackTrace();
+				continue;
+			}
+			suite.addTest((Test) test);
+		}
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.pde.api.tools.builder.tests.ApiBuilderTest#getDefaultProblemId()
+	 */
+	protected int getDefaultProblemId() {
+		return 0;
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.pde.api.tools.builder.tests.ApiBuilderTests#getTestingProjectName()
+	 */
+	protected String getTestingProjectName() {
+		return "dummy";
+	}
+	
+	/* (non-Javadoc)
+	 * 
+	 * Ensure a baseline has been created to compare against.
+	 * 
+	 * @see org.eclipse.pde.api.tools.builder.tests.ApiBuilderTest#setUp()
+	 */
+	@Override
+	protected void setUp() throws Exception {
+		super.setUp();
+		// populate the workspace with initial plug-ins/projects
+		createInitialWorkspace();
+		createBaseline();
+	}	
+	
+	/**
+	 * Creates the API baseline for this test.
+	 * 
+	 * @throws Exception
+	 */
+	protected void createBaseline() throws Exception {
+		String zipPath = getBaselineLocation();
+		if (zipPath != null) {
+			IApiProfileManager manager = ApiPlugin.getDefault().getApiProfileManager();
+			IPath path = new Path(zipPath);
+			String id = path.lastSegment();
+			IApiProfile perfline = manager.getApiProfile(id);
+			if (perfline == null) {
+				// create the API baseline
+				IPath baselineLocation = ApiTestsPlugin.getDefault().getStateLocation().append(id);
+				long start = System.currentTimeMillis();
+				System.out.println("Unzipping "+zipPath);
+				System.out.print("	in "+baselineLocation.toOSString()+"...");
+				Util.unzip(zipPath, baselineLocation.toOSString());
+				System.out.println(" done in "+(System.currentTimeMillis()-start)+"ms.");	
+					
+				perfline = Factory.newApiProfile(id);
+				File[] files = baselineLocation.toFile().listFiles();
+				IApiComponent[] components = new IApiComponent[files.length];
+				for (int i = 0; i < files.length; i++) {
+					IPath location = baselineLocation.append(files[i].getName());
+					components[i] = perfline.newApiComponent(location.toOSString());
+				}
+				perfline.addApiComponents(components);
+				manager.addApiProfile(perfline);
+				manager.setDefaultApiProfile(perfline.getName());			
+			}
+			IApiProfile baseline = manager.getDefaultApiProfile();
+			if (baseline != perfline) {
+				manager.setDefaultApiProfile(perfline.getName());
+			}
+		}
+	}
+	
+	/**
+	 * Creates the workspace by importing projects from the source zip. This is the 
+	 * initial state of the workspace.
+	 *  
+	 * @throws Exception
+	 */
+	protected void createInitialWorkspace() throws Exception {
+		// Get wksp info
+		IWorkspace workspace = ResourcesPlugin.getWorkspace();
+
+		// Modify resources workspace preferences to avoid disturbing tests while running them
+		IEclipsePreferences resourcesPreferences = new InstanceScope().getNode(ResourcesPlugin.PI_RESOURCES);
+		resourcesPreferences.put(ResourcesPlugin.PREF_AUTO_REFRESH, "false");
+		workspace.getDescription().setSnapshotInterval(Long.MAX_VALUE);
+		workspace.getDescription().setAutoBuilding(false);
+
+		// Get projects directories
+		long start = System.currentTimeMillis();
+		String fullSourceZipPath = getWorkspaceLocation();
+		IPath path = new Path(fullSourceZipPath);
+		String dirName = path.lastSegment();
+		String fileExtension = path.getFileExtension();
+		dirName = dirName.substring(0, dirName.length() - fileExtension.length());
+		IPath location = ApiTestsPlugin.getDefault().getStateLocation().append(dirName);
+		File dir = location.toFile();
+		if (dir.exists()) {
+			deleteDir(dir);
+		}
+		dir.mkdirs();
+		String targetWorkspacePath = location.toOSString();
+		System.out.println("Unzipping "+fullSourceZipPath);
+		System.out.print("	in "+targetWorkspacePath+"...");
+		Util.unzip(fullSourceZipPath, targetWorkspacePath);
+		System.out.println(" done in "+(System.currentTimeMillis()-start)+"ms.");
+		
+		start = System.currentTimeMillis();
+		System.out.println("Importing projects... ");
+		File root = dir;
+		File[] projects = root.listFiles();
+		for (int i = 0; i < projects.length; i++) {
+			System.out.println("\t" + projects[i].getName());
+			createExistingProject(projects[i]);
+		}
+		System.out.println(" done in "+(System.currentTimeMillis()-start)+"ms.");
+	}		
+	
+	/**
+	 * Recursively deletes directories and all files in it.
+	 * 
+	 * @param dir
+	 */
+	protected void deleteDir(File dir) {
+		File[] listFiles = dir.listFiles();
+		for (int i = 0; i < listFiles.length; i++) {
+			File file = listFiles[i];
+			if (file.isDirectory()) {
+				deleteDir(file);
+			}
+			file.delete();
+		}
+	}
+	
+	/**
+	 * Returns the a string of the absolute path in the local file system to an archive of the
+	 * API baseline to use for this test or <code>null</code> if none. Subclasses must override
+	 * if they need a baseline.
+	 * 
+	 * @return absolute path in the local file system to an archive of the
+	 * 	API baseline to use for this test or <code>null</code>
+	 */
+	protected String getBaselineLocation() {
+		return null;
+	}
+	
+	/**
+	 * Returns the a string of the absolute path in the local file system to an archive of the
+	 * source workspace to use for this test or <code>null</code> if none. Subclasses must override
+	 * if they need to populate a workspace.
+	 * 
+	 * @return absolute path in the local file system to an archive of the
+	 * 	source workspace to use for this test or <code>null</code>
+	 */	
+	protected String getWorkspaceLocation() {
+		return null;
+	}
+	
+	/**
+	 * @return the tests for this class
+	 */
+	public static Test suite() {
+		TestSuite suite = new TestSuite(PerformanceTest.class.getName());
+		collectTests(suite);
+		return suite;
+	}
+	
+	/**
+	 * Creates a project contained in the given directory.
+	 * 
+	 * @param projectDir directory containing existing project
+	 */
+	protected void createExistingProject(File projectDir) throws Exception {
+		String projectName = projectDir.getName();
+		final IWorkspace workspace = ResourcesPlugin.getWorkspace();
+		final IProject project = workspace.getRoot().getProject(projectName);
+		IProjectDescription description = workspace.newProjectDescription(projectName);
+		IPath locationPath = new Path(projectDir.getAbsolutePath());
+		description.setLocation(locationPath);
+		
+		// import from file system
+		File importSource = null;
+		// import project from location copying files - use default project
+		// location for this workspace
+		URI locationURI = description.getLocationURI();
+		// if location is null, project already exists in this location or
+		// some error condition occured.
+		assertNotNull("project description location is null", locationURI);
+		importSource = new File(locationURI);
+		IProjectDescription desc = workspace.newProjectDescription(projectName);
+		desc.setBuildSpec(description.getBuildSpec());
+		desc.setComment(description.getComment());
+		desc.setDynamicReferences(description.getDynamicReferences());
+		desc.setNatureIds(description.getNatureIds());
+		desc.setReferencedProjects(description.getReferencedProjects());
+		description = desc;
+
+		project.create(description, null);
+		project.open(null);
+
+		// import operation to import project files
+		List filesToImport = FileSystemStructureProvider.INSTANCE.getChildren(importSource);
+		ImportOperation operation = new ImportOperation(
+				project.getFullPath(), importSource,
+				FileSystemStructureProvider.INSTANCE, new IOverwriteQuery() {
+					public String queryOverwrite(String pathString) {
+						return IOverwriteQuery.ALL;
+					}
+				}, filesToImport);
+		operation.setOverwriteResources(true);
+		operation.setCreateContainerStructure(false);
+		operation.run(new NullProgressMonitor());
+	}	
+	
+	/**
+	 * Updates the contents of a workspace file at the specified location (full path),
+	 * with the contents of a local file at the given replacement location (absolute path).
+	 * 
+	 * @param workspaceLocation
+	 * @param replacementLocation
+	 */
+	protected void updateWorkspaceFile(IPath workspaceLocation, IPath replacementLocation) throws Exception {
+		IFile file = getEnv().getWorkspace().getRoot().getFile(workspaceLocation);
+		assertTrue("Workspace file does not exist: " + workspaceLocation.toString(), file.exists());
+		File replacement = replacementLocation.toFile();
+		assertTrue("Replacement file does not exist: " + replacementLocation.toOSString(), replacement.exists());
+		FileInputStream stream = new FileInputStream(replacement);
+		file.setContents(stream, false, true, null);
+		stream.close();
+	}
+	
+	/**
+	 * Updates the contents of a workspace file at the specified location (full path),
+	 * with the contents of a local file at the given replacement location (absolute path).
+	 * 
+	 * @param workspaceLocation
+	 * @param replacementLocation
+	 */
+	protected void createWorkspaceFile(IPath workspaceLocation, IPath replacementLocation) throws Exception {
+		IFile file = getEnv().getWorkspace().getRoot().getFile(workspaceLocation);
+		assertFalse("Workspace file should not exist: " + workspaceLocation.toString(), file.exists());
+		File replacement = replacementLocation.toFile();
+		assertTrue("Replacement file does not exist: " + replacementLocation.toOSString(), replacement.exists());
+		FileInputStream stream = new FileInputStream(replacement);
+		file.create(stream, false, null);
+		stream.close();
+	}
+	
+	/**
+	 * Deletes the workspace file at the specified location (full path).
+	 * 
+	 * @param workspaceLocation
+	 */
+	protected void deleteWorkspaceFile(IPath workspaceLocation) throws Exception {
+		IFile file = getEnv().getWorkspace().getRoot().getFile(workspaceLocation);
+		assertTrue("Workspace file does not exist: " + workspaceLocation.toString(), file.exists());
+		file.delete(false, null);
+	}	
+	
+	/**
+	 * Returns a path in the local file system to an updated file based on this tests source path
+	 * and filename.
+	 * 
+	 * @param filename name of file to update
+	 * @return path to the file in the local file system
+	 */
+	protected IPath getUpdateFilePath(String filename) {
+		return TestSuiteHelper.getPluginDirectoryPath().append(TEST_SOURCE_ROOT).append(getTestSourcePath()).append(filename);
+	}
+	
+	/**
+	 * Performs a compatibility test. The workspace file at the specified (full workspace path)
+	 * location is updated with a corresponding file from test data. A build is performed
+	 * and problems are compared against the expected problems for the associated resource.
+	 * 
+	 * @param workspaceFile file to update
+	 * @param incremental whether to perform an incremental (<code>true</code>) or
+	 * 	full (<code>false</code>) build
+	 * @throws Exception
+	 */
+	protected void performCompatibilityTest(IPath workspaceFile, boolean incremental) throws Exception {
+			updateWorkspaceFile(
+					workspaceFile,
+					getUpdateFilePath(workspaceFile.lastSegment()));
+			if (incremental) {
+				incrementalBuild();
+			} else {
+				fullBuild();
+			}
+			ApiProblem[] problems = getEnv().getProblemsFor(workspaceFile, null);
+			assertProblems(problems);
+	}
+	
+	/**
+	 * Performs a compatibility test. The workspace file at the specified (full workspace path)
+	 * location is updated with a corresponding file from test data. A build is performed
+	 * and problems are compared against the expected problems for the associated resource.
+	 * 
+	 * @param workspaceFile file to update
+	 * @param incremental whether to perform an incremental (<code>true</code>) or
+	 * 	full (<code>false</code>) build
+	 * @throws Exception
+	 */
+	protected void performVersionTest(IPath workspaceFile, boolean incremental) throws Exception {
+			updateWorkspaceFile(
+					workspaceFile,
+					getUpdateFilePath(workspaceFile.lastSegment()));
+			if (incremental) {
+				incrementalBuild();
+			} else {
+				fullBuild();
+			}
+			ApiProblem[] problems = getEnv().getProblemsFor(new Path(workspaceFile.segment(0)).append(JarFile.MANIFEST_NAME), null);
+			assertProblems(problems);
+	}	
+	
+	/**
+	 * Performs a compatibility test. The workspace file at the specified (full workspace path)
+	 * location is deleted. A build is performed and problems are compared against the expected
+	 * problems for the associated resource.
+	 * 
+	 * @param workspaceFile file to update
+	 * @param incremental whether to perform an incremental (<code>true</code>) or
+	 * 	full (<code>false</code>) build
+	 * @throws Exception
+	 */
+	protected void performDeletionCompatibilityTest(IPath workspaceFile, boolean incremental) throws Exception {
+			deleteWorkspaceFile(workspaceFile);
+			if (incremental) {
+				incrementalBuild();
+			} else {
+				fullBuild();
+			}
+			ApiProblem[] problems = getEnv().getProblems();
+			assertProblems(problems);
+	}	
+	
+	/**
+	 * Performs a compatibility test. The workspace file at the specified (full workspace path)
+	 * location is created. A build is performed and problems are compared against the expected
+	 * problems for the associated resource.
+	 * 
+	 * @param workspaceFile file to update
+	 * @param incremental whether to perform an incremental (<code>true</code>) or
+	 * 	full (<code>false</code>) build
+	 * @throws Exception
+	 */
+	protected void performCreationCompatibilityTest(IPath workspaceFile, boolean incremental) throws Exception {
+		createWorkspaceFile(
+				workspaceFile,
+				getUpdateFilePath(workspaceFile.lastSegment()));
+		if (incremental) {
+			incrementalBuild();
+		} else {
+			fullBuild();
+		}
+		ApiProblem[] problems = getEnv().getProblems();
+		assertProblems(problems);
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.pde.api.tools.builder.tests.ApiBuilderTest#assertProblems(org.eclipse.pde.api.tools.builder.tests.ApiProblem[])
+	 */
+	@Override
+	protected void assertProblems(ApiProblem[] problems) {
+		super.assertProblems(problems);
+		int[] expectedProblemIds = getExpectedProblemIds();
+		int length = problems.length;
+		if (expectedProblemIds.length != length) {
+			for (int i = 0; i < length; i++) {
+				System.err.println(problems[i]);
+			}
+		}
+		assertEquals("Wrong number of problems", expectedProblemIds.length, length);
+		String[][] args = getExpectedMessageArgs();
+		if (args != null) {
+			// compare messages
+			Set<String> set = new HashSet<String>();
+			for (int i = 0; i < length; i++) {
+				set.add(problems[i].getMessage());
+			}
+			for (int i = 0; i < expectedProblemIds.length; i++) {
+				String[] messageArgs = args[i];
+				int messageId = ApiProblemFactory.getProblemMessageId(expectedProblemIds[i]);
+				String message = ApiProblemFactory.getLocalizedMessage(messageId, messageArgs);
+				assertTrue("Missing expected problem: " + message, set.remove(message));
+			}
+		} else {
+			// compare id's
+			Set<Integer> set = new HashSet<Integer>();
+			for (int i = 0; i < length; i++) {
+				set.add(new Integer(problems[i].getProblemId()));
+			}
+			for (int i = 0; i < expectedProblemIds.length; i++) {
+				assertTrue("Missing expected problem: " + expectedProblemIds[i], set.remove(new Integer(expectedProblemIds[i])));
+			}
+		}
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/tests/ApiTestsPlugin.java b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/tests/ApiTestsPlugin.java
new file mode 100644
index 0000000000..56e41668f9
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/tests/ApiTestsPlugin.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.pde.api.tools.tests;
+
+import org.eclipse.core.runtime.Plugin;
+
+/**
+ * Test Plug-in Class
+ */
+public class ApiTestsPlugin extends Plugin {
+	
+	private static ApiTestsPlugin fgDefault = null;
+
+	public ApiTestsPlugin() {
+		fgDefault = this;
+	}
+	
+	/**
+	 * Returns the test plug-in.
+	 * 
+	 * @return the test plug-in
+	 */
+	public static ApiTestsPlugin getDefault() {
+		return fgDefault;
+	}
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/tests/ApiToolsPerformanceTestSuite.java b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/tests/ApiToolsPerformanceTestSuite.java
new file mode 100644
index 0000000000..463d9e0e6c
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/tests/ApiToolsPerformanceTestSuite.java
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.pde.api.tools.tests;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.eclipse.pde.api.tools.builder.tests.performance.PerformanceTest;
+
+
+/**
+ * Performance test suite that is run as a JUnit plug-in test
+ */
+public class ApiToolsPerformanceTestSuite extends TestSuite {
+
+	/**
+	 * Returns the suite.  This is required to
+	 * use the JUnit Launcher.
+	 * @return the test
+	 */
+	public static Test suite() {
+		return new ApiToolsPerformanceTestSuite();
+	}
+	
+	/**
+	 * Constructor
+	 */
+	public ApiToolsPerformanceTestSuite() {
+		addTest(PerformanceTest.suite());
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/tests/util/ProjectUtils.java b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/tests/util/ProjectUtils.java
index 22afd0f513..df7eb9bdcc 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/tests/util/ProjectUtils.java
+++ b/apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/tests/util/ProjectUtils.java
@@ -39,13 +39,19 @@ import org.eclipse.pde.internal.core.ICoreConstants;
 import org.eclipse.pde.internal.core.build.WorkspaceBuildModel;
 import org.eclipse.pde.internal.core.bundle.BundlePluginBase;
 import org.eclipse.pde.internal.core.bundle.WorkspaceBundleFragmentModel;
+import org.eclipse.pde.internal.core.bundle.WorkspaceBundleModel;
 import org.eclipse.pde.internal.core.bundle.WorkspaceBundlePluginModel;
 import org.eclipse.pde.internal.core.ibundle.IBundle;
 import org.eclipse.pde.internal.core.ibundle.IBundlePluginBase;
 import org.eclipse.pde.internal.core.ibundle.IBundlePluginModelBase;
+import org.eclipse.pde.internal.core.ibundle.IManifestHeader;
 import org.eclipse.pde.internal.core.plugin.WorkspaceFragmentModel;
 import org.eclipse.pde.internal.core.plugin.WorkspacePluginModel;
 import org.eclipse.pde.internal.core.plugin.WorkspacePluginModelBase;
+import org.eclipse.pde.internal.core.text.bundle.BundleModelFactory;
+import org.eclipse.pde.internal.core.text.bundle.ExportPackageHeader;
+import org.eclipse.pde.internal.core.text.bundle.ExportPackageObject;
+import org.eclipse.pde.internal.core.text.bundle.PackageFriend;
 import org.eclipse.pde.internal.ui.wizards.plugin.AbstractFieldData;
 import org.eclipse.pde.ui.IFieldData;
 import org.eclipse.pde.ui.IFragmentFieldData;
@@ -443,6 +449,127 @@ public class ProjectUtils {
 		if(base != null) {
 			base.save();
 		}
+		
+	}
+	
+	/**
+	 * Removes the given package from the exported packages header, if it exists.
+	 * 
+	 * This method is not safe to use in a headless manner.
+	 * 
+	 * @param project the project to remove the package from
+	 * @param packagename the name of the package to remove from the export package header
+	 */
+	public static void removeExportedPackage(IProject project, String packagename) {
+		IBundle bundle = getBundle(project);
+		if(bundle == null) {
+			return;
+		}
+		try {
+			ExportPackageHeader header = getExportedPackageHeader(bundle);
+			Object removed = header.removePackage(packagename);
+			if(removed != null) {
+				bundle.setHeader(Constants.EXPORT_PACKAGE, header.getValue());
+			}
+		}
+		finally {
+			WorkspaceBundleModel model = (WorkspaceBundleModel) bundle.getModel();
+			if(model.isDirty()) {
+				model.save();
+				if(!model.isInSync()) {
+					model.load();
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Returns the {@link IBundle} for the given {@link IProject} if one exists. Otherwise <code>null</code> is returned.
+	 * 
+	 * This method is not safe to use in a headless manner.
+	 * 
+	 * @param project the project to get the {@link IBundle} for
+	 * @return the {@link IBundle} for the given project or <code>null</code> if one cannot be created
+	 */
+	public static IBundle getBundle(IProject project) {
+		IFile manifest = project.getFile(ICoreConstants.BUNDLE_FILENAME_DESCRIPTOR);
+		if(manifest == null || !manifest.exists()) {
+			return null;
+		}
+		WorkspacePluginModelBase plugin = new WorkspaceBundlePluginModel(manifest, project.getFile(ICoreConstants.PLUGIN_FILENAME_DESCRIPTOR));
+		IPluginBase pluginBase = plugin.getPluginBase();
+		if (pluginBase instanceof BundlePluginBase) {
+			return ((BundlePluginBase)pluginBase).getBundle();
+		}
+		return null;
+	}
+	
+	/**
+	 * Adds a new exported package to the manifest.
+	 * 
+	 * This method is not safe to use in a headless manner.
+	 * 
+	 * @param project the project to get the manifest information from
+	 * @param packagename the fully qualified name of the package to add 
+	 * @param internal if the added package should be internal or not
+	 * @param friends a listing of friends for this exported package
+	 * @throws CoreException if something bad happens
+	 */
+	public static void addExportedPackage(IProject project, String packagename, boolean internal, String[] friends) throws CoreException {
+		if(!project.exists() || packagename == null) {
+			//do no work
+			return;
+		}
+		IFile manifest = project.getFile(ICoreConstants.BUNDLE_FILENAME_DESCRIPTOR);
+		if(manifest == null || !manifest.exists()) {
+			createManifest(project, new TestFieldData(project.getName(), SRC_FOLDER, BIN_FOLDER));
+			manifest = project.getFile(ICoreConstants.BUNDLE_FILENAME_DESCRIPTOR);
+		}
+		IBundle bundle = getBundle(project);
+		if (bundle != null) {
+			ExportPackageObject pack = null;
+			try {
+				ExportPackageHeader header = getExportedPackageHeader(bundle);
+				if(header != null) {
+					pack = header.addPackage(packagename);
+					if(internal != pack.isInternal()) {
+						pack.setInternal(internal);
+					}
+					if(friends != null) {
+						for(int i = 0; i < friends.length; i++) {
+							if(friends[i] != null) {
+								pack.addFriend(new PackageFriend(pack, friends[i]));
+							}
+						}
+					}
+					bundle.setHeader(Constants.EXPORT_PACKAGE, header.getValue());
+				}
+			}
+			finally {
+				WorkspaceBundleModel model = (WorkspaceBundleModel) bundle.getModel();
+				if(model.isDirty()) {
+					model.save();
+					if(!model.isInSync()) {
+						model.load();
+					}
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Returns the {@link ExportPackageHeader} for the given {@link IBundle}.
+	 * @param bundle the bundle to get the header from
+	 * @return new {@link ExportPackageHeader} for the given {@link IBundle}
+	 */
+	public static ExportPackageHeader getExportedPackageHeader(IBundle bundle) {
+		IManifestHeader header = bundle.getManifestHeader(Constants.EXPORT_PACKAGE);
+		BundleModelFactory factory = new BundleModelFactory(bundle.getModel());
+		String value = "";
+		if(header != null && header.getValue() != null) {
+			value = header.getValue();
+		}
+		return (ExportPackageHeader) factory.createHeader(Constants.EXPORT_PACKAGE, value);
 	}
 	
 	/**
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/.classpath b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/.classpath
new file mode 100644
index 0000000000..64c5e31b7a
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/.project b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/.project
new file mode 100644
index 0000000000..043b360d52
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>bundle.a</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+	</natures>
+</projectDescription>
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..e126488a9b
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Wed Aug 13 13:59:24 CDT 2008
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..cd9a2f3dad
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/META-INF/MANIFEST.MF
@@ -0,0 +1,26 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: API Tools Tests Plug-in A
+Bundle-SymbolicName: bundle.a
+Bundle-Version: 1.0.0
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Export-Package: a.annotations,
+ a.bundles,
+ a.classes.constructors,
+ a.classes.fields,
+ a.classes.hierarchy,
+ a.classes.membertypes,
+ a.classes.methods,
+ a.classes.modifiers,
+ a.classes.restrictions,
+ a.classes.typeparameters,
+ a.constructors,
+ a.enums,
+ a.fields.modifiers,
+ a.interfaces.members,
+ a.interfaces.restrictions,
+ a.interfaces.typeparameters,
+ a.methods.modifiers,
+ a.methods.typeparameters,
+ a.since,
+ a.version
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/build.properties b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/build.properties
new file mode 100644
index 0000000000..34d2e4d2da
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/annotations/AddMethodwDef.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/annotations/AddMethodwDef.java
new file mode 100644
index 0000000000..1a1b6b5555
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/annotations/AddMethodwDef.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.annotations;
+
+/**
+ *
+ */
+public @interface AddMethodwDef {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/annotations/AddMethodwoDef.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/annotations/AddMethodwoDef.java
new file mode 100644
index 0000000000..b079218944
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/annotations/AddMethodwoDef.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.annotations;
+
+/**
+ *
+ */
+public @interface AddMethodwoDef {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/annotations/RemoveDefValue.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/annotations/RemoveDefValue.java
new file mode 100644
index 0000000000..6efa6566e9
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/annotations/RemoveDefValue.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.annotations;
+
+/**
+ *
+ */
+public @interface RemoveDefValue {
+
+	public int method() default 42;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/annotations/RemoveField.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/annotations/RemoveField.java
new file mode 100644
index 0000000000..78a4d573e8
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/annotations/RemoveField.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.annotations;
+
+/**
+ *
+ */
+public @interface RemoveField {
+
+	String FIELD = "FIELD";
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/annotations/RemoveMemberType.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/annotations/RemoveMemberType.java
new file mode 100644
index 0000000000..e4149e7513
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/annotations/RemoveMemberType.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.annotations;
+
+/**
+ *
+ */
+public @interface RemoveMemberType {
+
+	interface MemberType {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/annotations/RemoveMethod.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/annotations/RemoveMethod.java
new file mode 100644
index 0000000000..3cba7d1169
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/annotations/RemoveMethod.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.annotations;
+
+/**
+ *
+ */
+public @interface RemoveMethod {
+
+	public int method();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/annotations/ToClass.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/annotations/ToClass.java
new file mode 100644
index 0000000000..c0adba1edc
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/annotations/ToClass.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.annotations;
+
+/**
+ *
+ */
+public @interface ToClass {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/annotations/ToEnum.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/annotations/ToEnum.java
new file mode 100644
index 0000000000..761c042074
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/annotations/ToEnum.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.annotations;
+
+/**
+ *
+ */
+public @interface ToEnum {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/annotations/ToInterface.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/annotations/ToInterface.java
new file mode 100644
index 0000000000..716161e8f9
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/annotations/ToInterface.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.annotations;
+
+/**
+ *
+ */
+public @interface ToInterface {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/bundles/DeleteAndReplace.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/bundles/DeleteAndReplace.java
new file mode 100644
index 0000000000..e11df8ffa3
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/bundles/DeleteAndReplace.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.bundles;
+
+/**
+ *
+ */
+public class DeleteAndReplace {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/bundles/PublicToPackageVisibility.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/bundles/PublicToPackageVisibility.java
new file mode 100644
index 0000000000..93efdb19be
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/bundles/PublicToPackageVisibility.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.bundles;
+
+/**
+ *
+ */
+public class PublicToPackageVisibility {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/bundles/RemovePublicClass.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/bundles/RemovePublicClass.java
new file mode 100644
index 0000000000..f321ef086a
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/bundles/RemovePublicClass.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.bundles;
+
+/**
+ *
+ */
+public class RemovePublicClass {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/bundles/internal/RemovePrivateClass.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/bundles/internal/RemovePrivateClass.java
new file mode 100644
index 0000000000..9e0e30d5f4
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/bundles/internal/RemovePrivateClass.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.bundles.internal;
+
+/**
+ *
+ */
+public class RemovePrivateClass {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/AddPrivateConstructor.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/AddPrivateConstructor.java
new file mode 100644
index 0000000000..1e50a1d7f8
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/AddPrivateConstructor.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.constructors;
+
+/**
+ * Tests add a private constructor.
+ */
+public class AddPrivateConstructor {
+	
+	public AddPrivateConstructor(String foo) {
+		
+	}
+	
+	public int publicMethod(String arg) {
+		return -1;
+	}
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/AddProtectedConstructor.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/AddProtectedConstructor.java
new file mode 100644
index 0000000000..cfd18aa149
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/AddProtectedConstructor.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.constructors;
+
+/**
+ * Tests add a protected constructor.
+ */
+public class AddProtectedConstructor {
+	
+	protected AddProtectedConstructor(String foo) {
+		
+	}
+	
+	public int publicMethod(String arg) {
+		return -1;
+	}
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/AddPublicConstructor.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/AddPublicConstructor.java
new file mode 100644
index 0000000000..d952ee0acd
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/AddPublicConstructor.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.constructors;
+
+/**
+ * Tests add a public constructor.
+ */
+public class AddPublicConstructor {
+	
+	public AddPublicConstructor(String foo) {
+		
+	}
+	
+	public int publicMethod(String arg) {
+		return -1;
+	}
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/AddSinglePrivateConstructor.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/AddSinglePrivateConstructor.java
new file mode 100644
index 0000000000..26712b00e7
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/AddSinglePrivateConstructor.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.constructors;
+
+/**
+ * Tests add a private constructor.
+ */
+public class AddSinglePrivateConstructor {
+	
+	public int publicMethod(String arg) {
+		return -1;
+	}
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/AddSingleProtectedConstructor.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/AddSingleProtectedConstructor.java
new file mode 100644
index 0000000000..181344fcb4
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/AddSingleProtectedConstructor.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.constructors;
+
+/**
+ * Tests add a protected constructor.
+ */
+public class AddSingleProtectedConstructor {
+	
+	public int publicMethod(String arg) {
+		return -1;
+	}
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/AddSinglePublicConstructor.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/AddSinglePublicConstructor.java
new file mode 100644
index 0000000000..881433329f
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/AddSinglePublicConstructor.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.constructors;
+
+/**
+ * Tests add a public constructor.
+ */
+public class AddSinglePublicConstructor {
+	
+	public int publicMethod(String arg) {
+		return -1;
+	}
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemovePackageConstructor.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemovePackageConstructor.java
new file mode 100644
index 0000000000..3db2f8d15f
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemovePackageConstructor.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.constructors;
+
+/**
+ * Tests removing package protected constructor.
+ */
+public class RemovePackageConstructor {
+	
+	RemovePackageConstructor(int i) {
+	}
+
+	RemovePackageConstructor(String foo) {
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemovePrivateConstructor.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemovePrivateConstructor.java
new file mode 100644
index 0000000000..3d67385d69
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemovePrivateConstructor.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.constructors;
+
+/**
+ * Tests removing private constructor.
+ */
+public class RemovePrivateConstructor {
+	
+	private RemovePrivateConstructor(int i) {
+	}
+
+	private RemovePrivateConstructor(String foo) {
+	}
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemoveProtectedConstructor.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemoveProtectedConstructor.java
new file mode 100644
index 0000000000..18ccc69ffc
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemoveProtectedConstructor.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.constructors;
+
+/**
+ * Tests removing a protected API constructor.
+ */
+public class RemoveProtectedConstructor {
+	
+	protected RemoveProtectedConstructor(int i) {
+	}
+	
+	protected RemoveProtectedConstructor(String foo) {
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemoveProtectedConstructorNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemoveProtectedConstructorNoExtend.java
new file mode 100644
index 0000000000..daf4355fa2
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemoveProtectedConstructorNoExtend.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.constructors;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class RemoveProtectedConstructorNoExtend {
+	
+	protected RemoveProtectedConstructorNoExtend(int i) {
+	}
+	
+	protected RemoveProtectedConstructorNoExtend(String foo) {
+	}
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemoveProtectedConstructorNoExtendNoInstantiate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemoveProtectedConstructorNoExtendNoInstantiate.java
new file mode 100644
index 0000000000..e1de4bbba7
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemoveProtectedConstructorNoExtendNoInstantiate.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.constructors;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class RemoveProtectedConstructorNoExtendNoInstantiate {
+	
+	protected RemoveProtectedConstructorNoExtendNoInstantiate(int i) {
+	}
+	
+	protected RemoveProtectedConstructorNoExtendNoInstantiate(String foo) {
+	}
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemoveProtectedConstructorNoInstantiate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemoveProtectedConstructorNoInstantiate.java
new file mode 100644
index 0000000000..36bb6caf8f
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemoveProtectedConstructorNoInstantiate.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.constructors;
+
+/**
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class RemoveProtectedConstructorNoInstantiate {
+	
+	protected RemoveProtectedConstructorNoInstantiate(int i) {
+		
+	}
+	
+	protected RemoveProtectedConstructorNoInstantiate(String foo) {
+		
+	}	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemoveProtectedConstructorNoOverride.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemoveProtectedConstructorNoOverride.java
new file mode 100644
index 0000000000..f385639549
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemoveProtectedConstructorNoOverride.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.constructors;
+
+/**
+ * 
+ */
+public class RemoveProtectedConstructorNoOverride {
+	
+	/**
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 */
+	protected RemoveProtectedConstructorNoOverride(int i) {
+		
+	}
+	
+	/**
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 */
+	protected RemoveProtectedConstructorNoOverride(String foo) {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemoveProtectedConstructorNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemoveProtectedConstructorNoReference.java
new file mode 100644
index 0000000000..9bf676d99b
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemoveProtectedConstructorNoReference.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.constructors;
+
+/**
+ * 
+ */
+public class RemoveProtectedConstructorNoReference {
+	
+	/**
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	protected RemoveProtectedConstructorNoReference(int i) {
+		
+	}
+	
+	/**
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	protected RemoveProtectedConstructorNoReference(String foo) {
+		
+	}	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemovePublicConstructor.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemovePublicConstructor.java
new file mode 100644
index 0000000000..e8924bcb42
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemovePublicConstructor.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.constructors;
+
+/**
+ * Tests removing an API constructor.
+ */
+public class RemovePublicConstructor {
+	
+	public RemovePublicConstructor(int i) {
+		
+	}
+	
+	public RemovePublicConstructor(String foo) {
+		
+	}
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemovePublicConstructorNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemovePublicConstructorNoExtend.java
new file mode 100644
index 0000000000..797190e8f1
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemovePublicConstructorNoExtend.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.constructors;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class RemovePublicConstructorNoExtend {
+	
+	public RemovePublicConstructorNoExtend(int i) {
+	}
+	
+	public RemovePublicConstructorNoExtend(String foo) {
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemovePublicConstructorNoExtendNoInstantiate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemovePublicConstructorNoExtendNoInstantiate.java
new file mode 100644
index 0000000000..b4f79a9e2e
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemovePublicConstructorNoExtendNoInstantiate.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.constructors;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class RemovePublicConstructorNoExtendNoInstantiate {
+	
+	public RemovePublicConstructorNoExtendNoInstantiate(int i) {
+	}
+	
+	public RemovePublicConstructorNoExtendNoInstantiate(String foo) {
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemovePublicConstructorNoInstantiate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemovePublicConstructorNoInstantiate.java
new file mode 100644
index 0000000000..8ae6120401
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemovePublicConstructorNoInstantiate.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.constructors;
+
+/**
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class RemovePublicConstructorNoInstantiate {
+	
+	public RemovePublicConstructorNoInstantiate(int i) {
+	}
+	
+	public RemovePublicConstructorNoInstantiate(String foo) {
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemovePublicConstructorNoOverride.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemovePublicConstructorNoOverride.java
new file mode 100644
index 0000000000..943886fb75
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemovePublicConstructorNoOverride.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.constructors;
+
+/**
+ * 
+ */
+public class RemovePublicConstructorNoOverride {
+	
+	/**
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 */
+	public RemovePublicConstructorNoOverride(int i) {
+	}
+
+	/**
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 */
+	public RemovePublicConstructorNoOverride(String foo) {
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemovePublicConstructorNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemovePublicConstructorNoReference.java
new file mode 100644
index 0000000000..bda50f4fd1
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemovePublicConstructorNoReference.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.constructors;
+
+/**
+ * 
+ */
+public class RemovePublicConstructorNoReference {
+	
+	/**
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	public RemovePublicConstructorNoReference(int i) {
+	}
+	
+	/**
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	public RemovePublicConstructorNoReference(String foo) {
+	}	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemoveTwoPublicConstructors.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemoveTwoPublicConstructors.java
new file mode 100644
index 0000000000..6f4c470364
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/constructors/RemoveTwoPublicConstructors.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.constructors;
+
+/**
+ * Tests removing constructors.
+ */
+public class RemoveTwoPublicConstructors {
+	
+	public RemoveTwoPublicConstructors(int i) {
+	}
+	public RemoveTwoPublicConstructors(String foo) {
+	}	
+}
+
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/AddPrivateField.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/AddPrivateField.java
new file mode 100644
index 0000000000..6b5e1d6d43
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/AddPrivateField.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.fields;
+
+/**
+ * Tests adding private field.
+ */
+public class AddPrivateField {
+
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/AddProtectedField.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/AddProtectedField.java
new file mode 100644
index 0000000000..f2afd4ca48
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/AddProtectedField.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.fields;
+
+/**
+ * Tests adding protected field.
+ */
+public class AddProtectedField {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/AddPublicField.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/AddPublicField.java
new file mode 100644
index 0000000000..9fddac1502
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/AddPublicField.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.fields;
+
+/**
+ * Tests adding public field.
+ */
+public class AddPublicField {
+
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/RemovePackageField.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/RemovePackageField.java
new file mode 100644
index 0000000000..e3a83bba7f
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/RemovePackageField.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.fields;
+
+/**
+ * Tests removing package protected field.
+ */
+public class RemovePackageField {
+	
+	String PACKAGE_FIELD = "FOO";
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/RemovePrivateField.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/RemovePrivateField.java
new file mode 100644
index 0000000000..0e7ae9523b
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/RemovePrivateField.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.fields;
+
+/**
+ * Tests removing private field.
+ */
+public class RemovePrivateField {
+	
+	private String PRIVATE_FIELD = "FOO";
+	
+	public String get() {
+		return PRIVATE_FIELD;
+	}
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/RemoveProtectedField.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/RemoveProtectedField.java
new file mode 100644
index 0000000000..069bd5548a
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/RemoveProtectedField.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.fields;
+
+/**
+ * Tests removing protected field.
+ */
+public class RemoveProtectedField {
+	
+	protected String PROTECTED_FIELD = "FOO";
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/RemoveProtectedFieldNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/RemoveProtectedFieldNoExtend.java
new file mode 100644
index 0000000000..352f29cfbd
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/RemoveProtectedFieldNoExtend.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.fields;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class RemoveProtectedFieldNoExtend {
+	
+	protected String PROTECTED_FIELD = "FOO";
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/RemoveProtectedFieldNoExtendNoInstantiate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/RemoveProtectedFieldNoExtendNoInstantiate.java
new file mode 100644
index 0000000000..366f03dea8
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/RemoveProtectedFieldNoExtendNoInstantiate.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.fields;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class RemoveProtectedFieldNoExtendNoInstantiate {
+	
+	protected String PROTECTED_FIELD = "FOO";
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/RemoveProtectedFieldNoInstantiate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/RemoveProtectedFieldNoInstantiate.java
new file mode 100644
index 0000000000..71f5a11927
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/RemoveProtectedFieldNoInstantiate.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.fields;
+
+/**
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class RemoveProtectedFieldNoInstantiate {
+	
+	protected String PROTECTED_FIELD = "FOO";
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/RemoveProtectedFieldNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/RemoveProtectedFieldNoReference.java
new file mode 100644
index 0000000000..ffd1235f56
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/RemoveProtectedFieldNoReference.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.fields;
+
+/**
+ * Tests removing protected field.
+ */
+public class RemoveProtectedFieldNoReference {
+	
+	/**
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
+	protected String PROTECTED_FIELD = "FOO";
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/RemovePublicField.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/RemovePublicField.java
new file mode 100644
index 0000000000..1ef691e872
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/RemovePublicField.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.fields;
+
+/**
+ * Tests removing public field.
+ */
+public class RemovePublicField {
+	
+	public String PUBLIC_FIELD = "FOO";
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/RemovePublicFieldNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/RemovePublicFieldNoExtend.java
new file mode 100644
index 0000000000..36ffc704f2
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/RemovePublicFieldNoExtend.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.fields;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class RemovePublicFieldNoExtend {
+	
+	public String PUBLIC_FIELD = "FOO";
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/RemovePublicFieldNoExtendNoInstantiate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/RemovePublicFieldNoExtendNoInstantiate.java
new file mode 100644
index 0000000000..ed4d5456f4
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/RemovePublicFieldNoExtendNoInstantiate.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.fields;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class RemovePublicFieldNoExtendNoInstantiate {
+	
+	public String PUBLIC_FIELD = "FOO";
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/RemovePublicFieldNoInstantiate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/RemovePublicFieldNoInstantiate.java
new file mode 100644
index 0000000000..898764a13e
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/RemovePublicFieldNoInstantiate.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.fields;
+
+/**
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class RemovePublicFieldNoInstantiate {
+	
+	public String PUBLIC_FIELD = "FOO";
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/RemovePublicFieldNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/RemovePublicFieldNoReference.java
new file mode 100644
index 0000000000..c1936fbd90
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/RemovePublicFieldNoReference.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.fields;
+
+/**
+ * Tests removing public field.
+ */
+public class RemovePublicFieldNoReference {
+	
+	/**
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
+	public String PUBLIC_FIELD = "FOO";
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/RemoveTwoPublicFields.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/RemoveTwoPublicFields.java
new file mode 100644
index 0000000000..bc7c087af4
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/fields/RemoveTwoPublicFields.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.fields;
+
+/**
+ * Tests removing public field.
+ */
+public class RemoveTwoPublicFields {
+	
+	public String PUBLIC_FIELD1 = "FOO1";
+	
+	public String PUBLIC_FIELD2 = "FOO2";
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/AddInterfaceA.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/AddInterfaceA.java
new file mode 100644
index 0000000000..56e06173ad
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/AddInterfaceA.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.hierarchy;
+
+/**
+ *
+ */
+public class AddInterfaceA  {
+
+	/* (non-Javadoc)
+	 * @see a.classes.hierarchy.InterfaceA#methodA()
+	 */
+	public int methodA() {
+		return 0;
+	}
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/ChangeInterfaceFromAtoB.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/ChangeInterfaceFromAtoB.java
new file mode 100644
index 0000000000..16700be5de
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/ChangeInterfaceFromAtoB.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.hierarchy;
+
+/**
+ *
+ */
+public class ChangeInterfaceFromAtoB implements InterfaceA {
+
+	/* (non-Javadoc)
+	 * @see a.classes.hierarchy.InterfaceA#methodA()
+	 */
+	public int methodA() {
+		return 0;
+	}
+
+	/* (non-Javadoc)
+	 * @see a.classes.hierarchy.InterfaceB#methodB()
+	 */
+	public String methodB() {
+		return null;
+	}
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/ChangedFromAtoD.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/ChangedFromAtoD.java
new file mode 100644
index 0000000000..0f71fe5e18
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/ChangedFromAtoD.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.hierarchy;
+
+/**
+ *
+ */
+public class ChangedFromAtoD extends ClassA {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/ClassA.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/ClassA.java
new file mode 100644
index 0000000000..ee46d496bd
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/ClassA.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.hierarchy;
+
+/**
+ * A base class
+ */
+public class ClassA {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/ClassB.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/ClassB.java
new file mode 100644
index 0000000000..dea736e74f
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/ClassB.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.hierarchy;
+
+/**
+ * A subclass of A
+ */
+public class ClassB extends ClassA {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/ClassC.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/ClassC.java
new file mode 100644
index 0000000000..873bb34203
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/ClassC.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.hierarchy;
+
+/**
+ * A subclass of A and B
+ */
+public class ClassC extends ClassB {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/ClassD.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/ClassD.java
new file mode 100644
index 0000000000..844dedba06
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/ClassD.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.hierarchy;
+
+/**
+ *
+ */
+public class ClassD {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/InterfaceA.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/InterfaceA.java
new file mode 100644
index 0000000000..a99dcd2e7a
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/InterfaceA.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.hierarchy;
+
+/**
+ *
+ */
+public interface InterfaceA {
+	
+	public int methodA();
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/InterfaceB.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/InterfaceB.java
new file mode 100644
index 0000000000..1c83a8a843
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/InterfaceB.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.hierarchy;
+
+/**
+ *
+ */
+public interface InterfaceB {
+
+	public String methodB();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/ReduceFromCtoA.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/ReduceFromCtoA.java
new file mode 100644
index 0000000000..d59da5f4b4
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/ReduceFromCtoA.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.hierarchy;
+
+/**
+ * Reduce superclass from C to A
+ */
+public class ReduceFromCtoA extends ClassC {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/ReduceFromCtoB.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/ReduceFromCtoB.java
new file mode 100644
index 0000000000..cfbb03fc74
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/ReduceFromCtoB.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.hierarchy;
+
+/**
+ * Reduce superclass from C to B
+ */
+public class ReduceFromCtoB extends ClassC {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/ReduceFromCtoObject.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/ReduceFromCtoObject.java
new file mode 100644
index 0000000000..41e812ec9c
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/ReduceFromCtoObject.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.hierarchy;
+
+/**
+ * Reduce super class from C to Object
+ */
+public class ReduceFromCtoObject extends ClassC {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/ReduceInterfaceFromABtoA.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/ReduceInterfaceFromABtoA.java
new file mode 100644
index 0000000000..495721747f
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/ReduceInterfaceFromABtoA.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.hierarchy;
+
+/**
+ *
+ */
+public class ReduceInterfaceFromABtoA implements InterfaceA, InterfaceB {
+
+	/* (non-Javadoc)
+	 * @see a.classes.hierarchy.InterfaceA#methodA()
+	 */
+	public int methodA() {
+		return 0;
+	}
+
+	/* (non-Javadoc)
+	 * @see a.classes.hierarchy.InterfaceB#methodB()
+	 */
+	public String methodB() {
+		return null;
+	}
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/ReduceInterfaceFromABtoEmpty.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/ReduceInterfaceFromABtoEmpty.java
new file mode 100644
index 0000000000..2244c5e562
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/ReduceInterfaceFromABtoEmpty.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.hierarchy;
+
+/**
+ *
+ */
+public class ReduceInterfaceFromABtoEmpty implements InterfaceA, InterfaceB {
+
+	/* (non-Javadoc)
+	 * @see a.classes.hierarchy.InterfaceA#methodA()
+	 */
+	public int methodA() {
+		return 0;
+	}
+
+	/* (non-Javadoc)
+	 * @see a.classes.hierarchy.InterfaceB#methodB()
+	 */
+	public String methodB() {
+		return null;
+	}
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/RemoveIntSuperClassWithMethod.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/RemoveIntSuperClassWithMethod.java
new file mode 100644
index 0000000000..25735671b2
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/RemoveIntSuperClassWithMethod.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.hierarchy;
+
+import a.classes.internal.InternalClassWithMethod;
+
+/**
+ *
+ */
+public class RemoveIntSuperClassWithMethod extends InternalClassWithMethod {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/RemoveInternalSuperClass.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/RemoveInternalSuperClass.java
new file mode 100644
index 0000000000..ada3a58061
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/RemoveInternalSuperClass.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.hierarchy;
+
+import a.classes.internal.InternalClass;
+
+/**
+ *
+ */
+public class RemoveInternalSuperClass extends InternalClass {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/SubClazz.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/SubClazz.java
new file mode 100644
index 0000000000..ceaaea540b
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/SubClazz.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.hierarchy;
+
+/**
+ *
+ */
+public class SubClazz extends SuperClazz {
+
+	public void pushUp() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/SubclassInternalClass.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/SubclassInternalClass.java
new file mode 100644
index 0000000000..977f4a4acc
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/SubclassInternalClass.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.hierarchy;
+
+import a.classes.internal.RemoveInternalMethod;
+
+/**
+ *
+ */
+public class SubclassInternalClass extends RemoveInternalMethod {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/SuperClazz.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/SuperClazz.java
new file mode 100644
index 0000000000..3a53c79ebc
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/hierarchy/SuperClazz.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.hierarchy;
+
+/**
+ *
+ */
+public class SuperClazz {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/internal/InternalClass.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/internal/InternalClass.java
new file mode 100644
index 0000000000..41651891da
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/internal/InternalClass.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.internal;
+
+/**
+ *
+ */
+public class InternalClass {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/internal/InternalClassWithMethod.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/internal/InternalClassWithMethod.java
new file mode 100644
index 0000000000..0a390becec
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/internal/InternalClassWithMethod.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.internal;
+
+/**
+ *
+ */
+public class InternalClassWithMethod {
+
+	public void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/internal/RemoveInternalConstructor.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/internal/RemoveInternalConstructor.java
new file mode 100644
index 0000000000..841951986e
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/internal/RemoveInternalConstructor.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.internal;
+
+/**
+ *
+ */
+public class RemoveInternalConstructor {
+
+	public RemoveInternalConstructor() {}
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/internal/RemoveInternalMethod.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/internal/RemoveInternalMethod.java
new file mode 100644
index 0000000000..207ecf0af7
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/internal/RemoveInternalMethod.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.internal;
+
+/**
+ *
+ */
+public class RemoveInternalMethod {
+
+	public void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/membertypes/PackageToPrivateVisibility.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/membertypes/PackageToPrivateVisibility.java
new file mode 100644
index 0000000000..4ffed9fc91
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/membertypes/PackageToPrivateVisibility.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.membertypes;
+
+/**
+ *
+ */
+public class PackageToPrivateVisibility {
+
+	class PackageToPrivate {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/membertypes/ProtectedToPackageVisibility.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/membertypes/ProtectedToPackageVisibility.java
new file mode 100644
index 0000000000..8508694a7a
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/membertypes/ProtectedToPackageVisibility.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.membertypes;
+
+/**
+ *
+ */
+public class ProtectedToPackageVisibility {
+
+	protected class ProtectedToPackage {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/membertypes/ProtectedToPackageVisibilityNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/membertypes/ProtectedToPackageVisibilityNoExtend.java
new file mode 100644
index 0000000000..2151210595
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/membertypes/ProtectedToPackageVisibilityNoExtend.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.membertypes;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class ProtectedToPackageVisibilityNoExtend {
+
+	protected class ProtectedToPackage {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/membertypes/ProtectedToPrivateVisibility.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/membertypes/ProtectedToPrivateVisibility.java
new file mode 100644
index 0000000000..0fb65077f8
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/membertypes/ProtectedToPrivateVisibility.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.membertypes;
+
+/**
+ *
+ */
+public class ProtectedToPrivateVisibility {
+
+	protected class ProtectedToPrivate {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/membertypes/ProtectedToPrivateVisibilityNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/membertypes/ProtectedToPrivateVisibilityNoExtend.java
new file mode 100644
index 0000000000..0c95536531
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/membertypes/ProtectedToPrivateVisibilityNoExtend.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.membertypes;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class ProtectedToPrivateVisibilityNoExtend {
+
+	protected class ProtectedToPrivate {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/membertypes/PublicToPackageVisibility.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/membertypes/PublicToPackageVisibility.java
new file mode 100644
index 0000000000..7e9c1a971c
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/membertypes/PublicToPackageVisibility.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.membertypes;
+
+/**
+ *
+ */
+public class PublicToPackageVisibility {
+
+	public class PublicToPackage {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/membertypes/PublicToPrivateVisibility.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/membertypes/PublicToPrivateVisibility.java
new file mode 100644
index 0000000000..789dec18e5
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/membertypes/PublicToPrivateVisibility.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.membertypes;
+
+/**
+ *
+ */
+public class PublicToPrivateVisibility {
+
+	public class PublicToPrivate {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/membertypes/PublicToProtectedVisibility.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/membertypes/PublicToProtectedVisibility.java
new file mode 100644
index 0000000000..fc4a16f418
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/membertypes/PublicToProtectedVisibility.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.membertypes;
+
+/**
+ *
+ */
+public class PublicToProtectedVisibility {
+
+	public class PublicToProtected {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/membertypes/RemovePackageMemberType.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/membertypes/RemovePackageMemberType.java
new file mode 100644
index 0000000000..aa8c7bd9c7
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/membertypes/RemovePackageMemberType.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.membertypes;
+
+/**
+ *
+ */
+public class RemovePackageMemberType {
+
+	class PacakgeType {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/membertypes/RemovePrivateMemberType.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/membertypes/RemovePrivateMemberType.java
new file mode 100644
index 0000000000..827524ef3d
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/membertypes/RemovePrivateMemberType.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.membertypes;
+
+/**
+ *
+ */
+public class RemovePrivateMemberType {
+	
+	private class PrivateType {
+		
+	}
+	
+	void foo() {
+		new PrivateType().toString();
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/membertypes/RemoveProtectedMemberType.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/membertypes/RemoveProtectedMemberType.java
new file mode 100644
index 0000000000..fe869c97e8
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/membertypes/RemoveProtectedMemberType.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.membertypes;
+
+/**
+ *
+ */
+public class RemoveProtectedMemberType {
+
+	protected class ProtectedType {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/membertypes/RemoveProtectedMemberTypeNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/membertypes/RemoveProtectedMemberTypeNoExtend.java
new file mode 100644
index 0000000000..b4aaadb3ec
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/membertypes/RemoveProtectedMemberTypeNoExtend.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.membertypes;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class RemoveProtectedMemberTypeNoExtend {
+
+	protected class ProtectedType {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/membertypes/RemovePublicMemberType.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/membertypes/RemovePublicMemberType.java
new file mode 100644
index 0000000000..91a8e9fbc9
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/membertypes/RemovePublicMemberType.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.membertypes;
+
+/**
+ *
+ */
+public class RemovePublicMemberType {
+
+	public class PublicType {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/AddAbstractMethod.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/AddAbstractMethod.java
new file mode 100644
index 0000000000..7bf4b21484
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/AddAbstractMethod.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.methods;
+
+/**
+ *
+ */
+public abstract class AddAbstractMethod {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/AddAbstractMethodNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/AddAbstractMethodNoExtend.java
new file mode 100644
index 0000000000..3fc8bad0b9
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/AddAbstractMethodNoExtend.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.methods;
+
+/**
+ * @noextend
+ */
+public abstract class AddAbstractMethodNoExtend {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/AddPrivateMethod.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/AddPrivateMethod.java
new file mode 100644
index 0000000000..750a008f7f
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/AddPrivateMethod.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.methods;
+
+/**
+ * Tests add a private method.
+ */
+public class AddPrivateMethod {
+	
+	public int publicMethod(String arg) {
+		return -1;
+	}
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/AddProtectedMethod.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/AddProtectedMethod.java
new file mode 100644
index 0000000000..d1b37bbe40
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/AddProtectedMethod.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.methods;
+
+/**
+ * Tests add a protected method.
+ */
+public class AddProtectedMethod {
+	
+	public int publicMethod(String arg) {
+		return -1;
+	}
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/AddPublicMethod.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/AddPublicMethod.java
new file mode 100644
index 0000000000..dd50ae32b4
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/AddPublicMethod.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.methods;
+
+/**
+ * Tests add a public method.
+ */
+public class AddPublicMethod {
+	
+	public int publicMethod(String arg) {
+		return -1;
+	}
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemovePackageMethod.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemovePackageMethod.java
new file mode 100644
index 0000000000..2e3ec5f6c0
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemovePackageMethod.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.methods;
+
+/**
+ * Tests removing package protected method.
+ */
+public class RemovePackageMethod {
+	
+	int packageMethod(String arg) {
+		return -1;
+	}
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemovePrivateMethod.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemovePrivateMethod.java
new file mode 100644
index 0000000000..78b172ed65
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemovePrivateMethod.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.methods;
+
+/**
+ * Tests removing private method.
+ */
+public class RemovePrivateMethod {
+	
+	public int publicMethod(String arg) {
+		return privateMethod("");
+	}
+	
+	private int privateMethod(String arg) {
+		return -1;
+	}
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemoveProtectedMethod.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemoveProtectedMethod.java
new file mode 100644
index 0000000000..583041e5fc
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemoveProtectedMethod.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.methods;
+
+/**
+ * Tests removing a protected API method.
+ */
+public class RemoveProtectedMethod {
+	
+	protected int protectedMethod(String arg) {
+		return -1;
+	}
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemoveProtectedMethodNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemoveProtectedMethodNoExtend.java
new file mode 100644
index 0000000000..97aef978f6
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemoveProtectedMethodNoExtend.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.methods;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class RemoveProtectedMethodNoExtend {
+	
+	protected int protectedMethod(String arg) {
+		return -1;
+	}
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemoveProtectedMethodNoExtendNoInstantiate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemoveProtectedMethodNoExtendNoInstantiate.java
new file mode 100644
index 0000000000..abef913f82
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemoveProtectedMethodNoExtendNoInstantiate.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.methods;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class RemoveProtectedMethodNoExtendNoInstantiate {
+	
+	protected int protectedMethod(String arg) {
+		return -1;
+	}
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemoveProtectedMethodNoInstantiate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemoveProtectedMethodNoInstantiate.java
new file mode 100644
index 0000000000..a461026815
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemoveProtectedMethodNoInstantiate.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.methods;
+
+/**
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class RemoveProtectedMethodNoInstantiate {
+	
+	protected int protectedMethod(String arg) {
+		return -1;
+	}
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemoveProtectedMethodNoOverride.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemoveProtectedMethodNoOverride.java
new file mode 100644
index 0000000000..5bfcb03764
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemoveProtectedMethodNoOverride.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.methods;
+
+/**
+ * 
+ */
+public class RemoveProtectedMethodNoOverride {
+	
+	/**
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 */
+	protected int protectedMethod(String arg) {
+		return -1;
+	}
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemoveProtectedMethodNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemoveProtectedMethodNoReference.java
new file mode 100644
index 0000000000..5c534a2f5a
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemoveProtectedMethodNoReference.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.methods;
+
+/**
+ * 
+ */
+public class RemoveProtectedMethodNoReference {
+	
+	/**
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	protected int protectedMethod(String arg) {
+		return -1;
+	}
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemovePublicMethod.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemovePublicMethod.java
new file mode 100644
index 0000000000..56d6ac1b7d
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemovePublicMethod.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.methods;
+
+/**
+ * Tests removing an API method.
+ */
+public class RemovePublicMethod {
+	
+	public int publicMethod(String arg) {
+		return -1;
+	}
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemovePublicMethodNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemovePublicMethodNoExtend.java
new file mode 100644
index 0000000000..499abec758
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemovePublicMethodNoExtend.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.methods;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class RemovePublicMethodNoExtend {
+	
+	public int publicMethod(String arg) {
+		return -1;
+	}
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemovePublicMethodNoExtendNoInstantiate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemovePublicMethodNoExtendNoInstantiate.java
new file mode 100644
index 0000000000..823cb491bf
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemovePublicMethodNoExtendNoInstantiate.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.methods;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class RemovePublicMethodNoExtendNoInstantiate {
+	
+	public int publicMethod(String arg) {
+		return -1;
+	}
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemovePublicMethodNoInstantiate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemovePublicMethodNoInstantiate.java
new file mode 100644
index 0000000000..c54d346526
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemovePublicMethodNoInstantiate.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.methods;
+
+/**
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class RemovePublicMethodNoInstantiate {
+	
+	public int publicMethod(String arg) {
+		return -1;
+	}
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemovePublicMethodNoOverride.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemovePublicMethodNoOverride.java
new file mode 100644
index 0000000000..8e57c8a0c0
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemovePublicMethodNoOverride.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.methods;
+
+/**
+ * 
+ */
+public class RemovePublicMethodNoOverride {
+	
+	/**
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 */
+	public int publicMethod(String arg) {
+		return -1;
+	}
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemovePublicMethodNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemovePublicMethodNoReference.java
new file mode 100644
index 0000000000..28c2f307c0
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemovePublicMethodNoReference.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.methods;
+
+/**
+ * 
+ */
+public class RemovePublicMethodNoReference {
+	
+	/**
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	public int publicMethod(String arg) {
+		return -1;
+	}
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemoveTwoPublicMethods.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemoveTwoPublicMethods.java
new file mode 100644
index 0000000000..987736a886
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/methods/RemoveTwoPublicMethods.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.methods;
+
+/**
+ * Tests removing an API method.
+ */
+public class RemoveTwoPublicMethods {
+	
+	public int methodOne(String arg) {
+		return -1;
+	}
+	
+	public String methodTwo(int foo) {
+		return "";
+	}
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/modifiers/AddAbstract.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/modifiers/AddAbstract.java
new file mode 100644
index 0000000000..a0b9d2bdb0
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/modifiers/AddAbstract.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.modifiers;
+
+/**
+ *
+ */
+public class AddAbstract {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/modifiers/AddAbstractNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/modifiers/AddAbstractNoExtend.java
new file mode 100644
index 0000000000..1fc83675b8
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/modifiers/AddAbstractNoExtend.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.modifiers;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class AddAbstractNoExtend {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/modifiers/AddAbstractNoExtendNoInstantiate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/modifiers/AddAbstractNoExtendNoInstantiate.java
new file mode 100644
index 0000000000..e50ac56d12
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/modifiers/AddAbstractNoExtendNoInstantiate.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.modifiers;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class AddAbstractNoExtendNoInstantiate {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/modifiers/AddAbstractNoInstantiate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/modifiers/AddAbstractNoInstantiate.java
new file mode 100644
index 0000000000..da5d936a36
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/modifiers/AddAbstractNoInstantiate.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.modifiers;
+
+/**
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class AddAbstractNoInstantiate {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/modifiers/AddFinal.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/modifiers/AddFinal.java
new file mode 100644
index 0000000000..48c1cc86e7
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/modifiers/AddFinal.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.modifiers;
+
+/**
+ *
+ */
+public class AddFinal {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/modifiers/AddFinalNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/modifiers/AddFinalNoExtend.java
new file mode 100644
index 0000000000..eb4349c848
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/modifiers/AddFinalNoExtend.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.modifiers;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class AddFinalNoExtend {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/modifiers/AddFinalNoExtendNoInstantiate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/modifiers/AddFinalNoExtendNoInstantiate.java
new file mode 100644
index 0000000000..c33c8cf322
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/modifiers/AddFinalNoExtendNoInstantiate.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.modifiers;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class AddFinalNoExtendNoInstantiate {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/modifiers/AddFinalNoInstantiate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/modifiers/AddFinalNoInstantiate.java
new file mode 100644
index 0000000000..2343e63d14
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/modifiers/AddFinalNoInstantiate.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.modifiers;
+
+/**
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class AddFinalNoInstantiate {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/modifiers/AddFinalRemoveNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/modifiers/AddFinalRemoveNoExtend.java
new file mode 100644
index 0000000000..9af389a3a6
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/modifiers/AddFinalRemoveNoExtend.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.modifiers;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class AddFinalRemoveNoExtend {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/modifiers/PublicToPackageVisibility.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/modifiers/PublicToPackageVisibility.java
new file mode 100644
index 0000000000..d1a394c02c
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/modifiers/PublicToPackageVisibility.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.modifiers;
+
+/**
+ *
+ */
+public class PublicToPackageVisibility {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/modifiers/RemoveFinal.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/modifiers/RemoveFinal.java
new file mode 100644
index 0000000000..4f756434f5
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/modifiers/RemoveFinal.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.modifiers;
+
+/**
+ *
+ */
+public final class RemoveFinal {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/modifiers/RemoveFinalAddNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/modifiers/RemoveFinalAddNoExtend.java
new file mode 100644
index 0000000000..7ff474b515
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/modifiers/RemoveFinalAddNoExtend.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.modifiers;
+
+/**
+ *
+ */
+public final class RemoveFinalAddNoExtend {
+
+	public void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/restrictions/AbstractAddNoInstantiate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/restrictions/AbstractAddNoInstantiate.java
new file mode 100644
index 0000000000..8a9a681037
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/restrictions/AbstractAddNoInstantiate.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.restrictions;
+
+/**
+ *
+ */
+public abstract class AbstractAddNoInstantiate {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/restrictions/AbstractRemoveNoInstantiate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/restrictions/AbstractRemoveNoInstantiate.java
new file mode 100644
index 0000000000..6fe383b59d
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/restrictions/AbstractRemoveNoInstantiate.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.restrictions;
+
+/**
+ * @noinstantiate
+ */
+public abstract class AbstractRemoveNoInstantiate {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/restrictions/AddNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/restrictions/AddNoExtend.java
new file mode 100644
index 0000000000..837821ca4d
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/restrictions/AddNoExtend.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.restrictions;
+
+/**
+ *
+ */
+public class AddNoExtend {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/restrictions/AddNoInstantiate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/restrictions/AddNoInstantiate.java
new file mode 100644
index 0000000000..7a8755a1d3
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/restrictions/AddNoInstantiate.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.restrictions;
+
+/**
+ *
+ */
+public class AddNoInstantiate {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/restrictions/FinalAddNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/restrictions/FinalAddNoExtend.java
new file mode 100644
index 0000000000..ceafd4e74b
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/restrictions/FinalAddNoExtend.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.restrictions;
+
+/**
+ *
+ */
+public final class FinalAddNoExtend {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/restrictions/FinalRemoveNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/restrictions/FinalRemoveNoExtend.java
new file mode 100644
index 0000000000..063a4f2563
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/restrictions/FinalRemoveNoExtend.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.restrictions;
+
+/**
+ * @noextend
+ */
+public final class FinalRemoveNoExtend {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/restrictions/NoInstantiateAddAbstract.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/restrictions/NoInstantiateAddAbstract.java
new file mode 100644
index 0000000000..5653d00ea9
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/restrictions/NoInstantiateAddAbstract.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.restrictions;
+
+/**
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class NoInstantiateAddAbstract {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/restrictions/RemoveNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/restrictions/RemoveNoExtend.java
new file mode 100644
index 0000000000..d38eef2962
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/restrictions/RemoveNoExtend.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.restrictions;
+
+/**
+ * @noextend
+ */
+public class RemoveNoExtend {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/AddClassBound.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/AddClassBound.java
new file mode 100644
index 0000000000..c4371b6108
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/AddClassBound.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.typeparameters;
+
+/**
+ *
+ */
+public class AddClassBound<E> {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/AddFirstTypeParameter.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/AddFirstTypeParameter.java
new file mode 100644
index 0000000000..d075b8df45
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/AddFirstTypeParameter.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.typeparameters;
+
+/**
+ *
+ */
+public class AddFirstTypeParameter {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/AddInterfaceBound.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/AddInterfaceBound.java
new file mode 100644
index 0000000000..40688a1326
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/AddInterfaceBound.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.typeparameters;
+
+/**
+ *
+ */
+public class AddInterfaceBound<E> {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/AddTypeParameter.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/AddTypeParameter.java
new file mode 100644
index 0000000000..2a3fbcab50
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/AddTypeParameter.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.typeparameters;
+
+/**
+ *
+ */
+public class AddTypeParameter<E> {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/Bound.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/Bound.java
new file mode 100644
index 0000000000..ce95dc16dd
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/Bound.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.typeparameters;
+
+/**
+ *
+ */
+public class Bound {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/BoundTwo.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/BoundTwo.java
new file mode 100644
index 0000000000..798359839b
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/BoundTwo.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.typeparameters;
+
+/**
+ *
+ */
+public class BoundTwo {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/ChangeClassBound.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/ChangeClassBound.java
new file mode 100644
index 0000000000..40b7f308f9
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/ChangeClassBound.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.typeparameters;
+
+/**
+ *
+ */
+public class ChangeClassBound<E extends Bound> {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/ChangeInterfaceBound.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/ChangeInterfaceBound.java
new file mode 100644
index 0000000000..3abd8088e7
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/ChangeInterfaceBound.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.typeparameters;
+
+/**
+ *
+ */
+public class ChangeInterfaceBound<E extends IBound> {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/ConvertToAnnotation.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/ConvertToAnnotation.java
new file mode 100644
index 0000000000..fb557558f0
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/ConvertToAnnotation.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.typeparameters;
+
+/**
+ *
+ */
+public class ConvertToAnnotation {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/ConvertToEnum.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/ConvertToEnum.java
new file mode 100644
index 0000000000..974f7fe328
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/ConvertToEnum.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.typeparameters;
+
+/**
+ *
+ */
+public class ConvertToEnum {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/ConvertToInterface.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/ConvertToInterface.java
new file mode 100644
index 0000000000..4b3d29b6cf
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/ConvertToInterface.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.typeparameters;
+
+/**
+ *
+ */
+public class ConvertToInterface {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/IBound.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/IBound.java
new file mode 100644
index 0000000000..c3c0682250
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/IBound.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.typeparameters;
+
+/**
+ *
+ */
+public interface IBound {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/IBoundTwo.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/IBoundTwo.java
new file mode 100644
index 0000000000..9fb1cbf541
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/IBoundTwo.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.typeparameters;
+
+/**
+ *
+ */
+public interface IBoundTwo {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/RemoveClassBound.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/RemoveClassBound.java
new file mode 100644
index 0000000000..2ff031bd96
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/RemoveClassBound.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.typeparameters;
+
+/**
+ *
+ */
+public class RemoveClassBound<E extends Bound> {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/RemoveInterfaceBound.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/RemoveInterfaceBound.java
new file mode 100644
index 0000000000..f95d0b4e7c
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/RemoveInterfaceBound.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.typeparameters;
+
+/**
+ *
+ */
+public class RemoveInterfaceBound<E extends IBound> {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/RemoveSecondInterfaceBound.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/RemoveSecondInterfaceBound.java
new file mode 100644
index 0000000000..8c608fdab9
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/RemoveSecondInterfaceBound.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.typeparameters;
+
+/**
+ *
+ */
+public class RemoveSecondInterfaceBound<E extends IBound & IBoundTwo>{
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/RemoveTypeParameter.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/RemoveTypeParameter.java
new file mode 100644
index 0000000000..40962d7adc
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/classes/typeparameters/RemoveTypeParameter.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.typeparameters;
+
+/**
+ *
+ */
+public class RemoveTypeParameter<E> {
+
+	public void add(E e) {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/constructors/AddTypeParameter.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/constructors/AddTypeParameter.java
new file mode 100644
index 0000000000..d49223d79a
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/constructors/AddTypeParameter.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.constructors;
+
+/**
+ *
+ */
+public class AddTypeParameter {
+
+	public <T> AddTypeParameter(T t) {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/constructors/ArrayToVarArgs.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/constructors/ArrayToVarArgs.java
new file mode 100644
index 0000000000..44b97352fd
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/constructors/ArrayToVarArgs.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.constructors;
+
+/**
+ *
+ */
+public class ArrayToVarArgs {
+
+	public ArrayToVarArgs(int x, int[] args) {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/constructors/ProtectedToPackage.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/constructors/ProtectedToPackage.java
new file mode 100644
index 0000000000..c2bb712c92
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/constructors/ProtectedToPackage.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.constructors;
+
+/**
+ *
+ */
+public class ProtectedToPackage {
+
+	protected ProtectedToPackage() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/constructors/ProtectedToPackageNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/constructors/ProtectedToPackageNoReference.java
new file mode 100644
index 0000000000..9d04925c30
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/constructors/ProtectedToPackageNoReference.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.constructors;
+
+/**
+ *
+ */
+public class ProtectedToPackageNoReference {
+
+	/**
+	 * @noreference This constructor is not intended to be referenced by clients.
+	 */
+	protected ProtectedToPackageNoReference() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/constructors/ProtectedToPrivate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/constructors/ProtectedToPrivate.java
new file mode 100644
index 0000000000..0566239cf1
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/constructors/ProtectedToPrivate.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.constructors;
+
+/**
+ *
+ */
+public class ProtectedToPrivate {
+
+	protected ProtectedToPrivate() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/constructors/ProtectedToPrivateNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/constructors/ProtectedToPrivateNoExtend.java
new file mode 100644
index 0000000000..07ec978eb9
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/constructors/ProtectedToPrivateNoExtend.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.constructors;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class ProtectedToPrivateNoExtend {
+
+	protected ProtectedToPrivateNoExtend() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/constructors/PublicToPackage.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/constructors/PublicToPackage.java
new file mode 100644
index 0000000000..3bdfcb3b9a
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/constructors/PublicToPackage.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.constructors;
+
+/**
+ *
+ */
+public class PublicToPackage {
+
+	public PublicToPackage() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/constructors/PublicToPrivate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/constructors/PublicToPrivate.java
new file mode 100644
index 0000000000..8bd8276590
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/constructors/PublicToPrivate.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.constructors;
+
+/**
+ *
+ */
+public class PublicToPrivate {
+	
+	public PublicToPrivate() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/constructors/PublicToPrivateNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/constructors/PublicToPrivateNoReference.java
new file mode 100644
index 0000000000..c42237a48b
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/constructors/PublicToPrivateNoReference.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.constructors;
+
+/**
+ *
+ */
+public class PublicToPrivateNoReference {
+	
+	/**
+	 * @noreference This constructor is not intended to be referenced by clients.
+	 */
+	public PublicToPrivateNoReference() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/constructors/PublicToProtected.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/constructors/PublicToProtected.java
new file mode 100644
index 0000000000..f87a569487
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/constructors/PublicToProtected.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.constructors;
+
+/**
+ *
+ */
+public class PublicToProtected {
+
+	public PublicToProtected() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/constructors/RemoveTypeParameter.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/constructors/RemoveTypeParameter.java
new file mode 100644
index 0000000000..837e1f32d2
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/constructors/RemoveTypeParameter.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.constructors;
+
+/**
+ *
+ */
+public class RemoveTypeParameter {
+
+	public <T, U> RemoveTypeParameter(T t){}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/constructors/VarArgsToArray.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/constructors/VarArgsToArray.java
new file mode 100644
index 0000000000..c971729222
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/constructors/VarArgsToArray.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.constructors;
+
+/**
+ *
+ */
+public class VarArgsToArray {
+
+	public VarArgsToArray(int x, int... args) {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/enums/RemoveEnumConstant.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/enums/RemoveEnumConstant.java
new file mode 100644
index 0000000000..deedc4b70f
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/enums/RemoveEnumConstant.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.enums;
+
+/**
+ *
+ */
+public enum RemoveEnumConstant {
+
+	A, B , C;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/enums/RemoveField.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/enums/RemoveField.java
new file mode 100644
index 0000000000..8dce16b9e2
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/enums/RemoveField.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.enums;
+
+/**
+ *
+ */
+public enum RemoveField {
+	
+	A, B, C;
+	
+	public static final String FIELD = "FOO";
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/enums/RemoveMemberType.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/enums/RemoveMemberType.java
new file mode 100644
index 0000000000..bc205b399e
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/enums/RemoveMemberType.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.enums;
+
+/**
+ *
+ */
+public enum RemoveMemberType {
+	A, B, C;
+	
+	public class MemberType {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/enums/RemoveMethod.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/enums/RemoveMethod.java
new file mode 100644
index 0000000000..3d4ff699e5
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/enums/RemoveMethod.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.enums;
+
+/**
+ *
+ */
+public enum RemoveMethod {
+	A, B, C;
+	
+	public int method(int x) {
+		return 42;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/enums/RemoveSuperInterface.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/enums/RemoveSuperInterface.java
new file mode 100644
index 0000000000..77ac34eca1
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/enums/RemoveSuperInterface.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.enums;
+
+import a.classes.hierarchy.InterfaceA;
+
+/**
+ * 
+ */
+public enum RemoveSuperInterface implements InterfaceA {
+	A, B, C;
+	public int methodA() {
+		return 0;
+	}
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/enums/ToAnnotation.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/enums/ToAnnotation.java
new file mode 100644
index 0000000000..4b43ced409
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/enums/ToAnnotation.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.enums;
+
+/**
+ *
+ */
+public enum ToAnnotation {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/enums/ToClass.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/enums/ToClass.java
new file mode 100644
index 0000000000..f5fe8221d0
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/enums/ToClass.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.enums;
+
+/**
+ *
+ */
+public enum ToClass {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/enums/ToInterface.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/enums/ToInterface.java
new file mode 100644
index 0000000000..ccf47e0b06
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/enums/ToInterface.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.enums;
+
+/**
+ *
+ */
+public enum ToInterface {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/AddFinal.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/AddFinal.java
new file mode 100644
index 0000000000..c81ecbc011
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/AddFinal.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class AddFinal {
+
+	public String ADD_FINAL;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/AddFinalNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/AddFinalNoReference.java
new file mode 100644
index 0000000000..ee2a7f85d8
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/AddFinalNoReference.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class AddFinalNoReference {
+
+	/**
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
+	public String ADD_FINAL;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/AddFinalOnStatic.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/AddFinalOnStatic.java
new file mode 100644
index 0000000000..fd1915c564
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/AddFinalOnStatic.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class AddFinalOnStatic {
+
+	public static String ADD_FINAL; 
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/AddFinalOnStaticNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/AddFinalOnStaticNoReference.java
new file mode 100644
index 0000000000..e054a15f84
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/AddFinalOnStaticNoReference.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class AddFinalOnStaticNoReference {
+
+	/**
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
+	public static String ADD_FINAL; 
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/AddNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/AddNoReference.java
new file mode 100644
index 0000000000..dc549575e0
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/AddNoReference.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class AddNoReference {
+
+	public String FIELD;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/AddStatic.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/AddStatic.java
new file mode 100644
index 0000000000..f2015c88bf
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/AddStatic.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class AddStatic {
+	
+	public String ADD_STATIC;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/AddStaticNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/AddStaticNoReference.java
new file mode 100644
index 0000000000..40d5efeafb
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/AddStaticNoReference.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class AddStaticNoReference {
+	
+	/**
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
+	public String ADD_STATIC;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/AddTypeArguments.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/AddTypeArguments.java
new file mode 100644
index 0000000000..c0ce83c80c
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/AddTypeArguments.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+import java.util.List;
+
+/**
+ *
+ */
+public class AddTypeArguments {
+
+	public List FIELD;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/ChangeType.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/ChangeType.java
new file mode 100644
index 0000000000..67ae74fe40
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/ChangeType.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class ChangeType {
+
+	public String FIELD;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/ChangeTypeNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/ChangeTypeNoExtend.java
new file mode 100644
index 0000000000..dc69e98280
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/ChangeTypeNoExtend.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class ChangeTypeNoExtend {
+
+	protected String FIELD;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/ChangeTypeNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/ChangeTypeNoReference.java
new file mode 100644
index 0000000000..5ea6b47468
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/ChangeTypeNoReference.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class ChangeTypeNoReference {
+
+	/**
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
+	public String FIELD;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/GeneralizeType.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/GeneralizeType.java
new file mode 100644
index 0000000000..1a87956df2
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/GeneralizeType.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class GeneralizeType {
+
+	public String FIELD;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/GeneralizeTypeNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/GeneralizeTypeNoExtend.java
new file mode 100644
index 0000000000..7161b59306
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/GeneralizeTypeNoExtend.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class GeneralizeTypeNoExtend {
+
+	protected String FIELD;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/GeneralizeTypeNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/GeneralizeTypeNoReference.java
new file mode 100644
index 0000000000..70337abdb0
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/GeneralizeTypeNoReference.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class GeneralizeTypeNoReference {
+
+	/**
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
+	public String FIELD;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/ModifyValue.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/ModifyValue.java
new file mode 100644
index 0000000000..45343c3685
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/ModifyValue.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class ModifyValue {
+
+	public static final String CONSTANT = "VALUE_1";
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/ProtectedToPackage.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/ProtectedToPackage.java
new file mode 100644
index 0000000000..ae866e2334
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/ProtectedToPackage.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class ProtectedToPackage {
+
+	protected String FIELD;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/ProtectedToPackageNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/ProtectedToPackageNoReference.java
new file mode 100644
index 0000000000..f6ed9fb56b
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/ProtectedToPackageNoReference.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class ProtectedToPackageNoReference {
+
+	/**
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
+	protected String FIELD;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/ProtectedToPackageRemoveNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/ProtectedToPackageRemoveNoReference.java
new file mode 100644
index 0000000000..99115f08f7
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/ProtectedToPackageRemoveNoReference.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class ProtectedToPackageRemoveNoReference {
+
+	/**
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
+	protected String FIELD;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/ProtectedToPrivate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/ProtectedToPrivate.java
new file mode 100644
index 0000000000..ffbed7f97d
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/ProtectedToPrivate.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class ProtectedToPrivate {
+
+	protected String FIELD;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/ProtectedToPrivateNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/ProtectedToPrivateNoExtend.java
new file mode 100644
index 0000000000..a57786c428
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/ProtectedToPrivateNoExtend.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class ProtectedToPrivateNoExtend {
+
+	protected String FIELD;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/PublicToPackage.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/PublicToPackage.java
new file mode 100644
index 0000000000..bec2dc88a3
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/PublicToPackage.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class PublicToPackage {
+
+	public String FIELD;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/PublicToPrivate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/PublicToPrivate.java
new file mode 100644
index 0000000000..7eb83c56ab
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/PublicToPrivate.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class PublicToPrivate {
+	
+	public String FIELD;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/PublicToPrivateNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/PublicToPrivateNoReference.java
new file mode 100644
index 0000000000..a4121d8d8f
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/PublicToPrivateNoReference.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class PublicToPrivateNoReference {
+	
+	/**
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
+	public String FIELD;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/PublicToProtected.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/PublicToProtected.java
new file mode 100644
index 0000000000..64a08ddb0c
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/PublicToProtected.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class PublicToProtected {
+
+	public String FIELD;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/RemoveFinalOnConstant.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/RemoveFinalOnConstant.java
new file mode 100644
index 0000000000..17b07560b0
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/RemoveFinalOnConstant.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class RemoveFinalOnConstant {
+
+	public static final String CONSTANT = "CONSTANT";
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/RemoveStatic.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/RemoveStatic.java
new file mode 100644
index 0000000000..563b344fc4
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/RemoveStatic.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class RemoveStatic {
+
+	public static String REMOVE_STATIC;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/RemoveStaticNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/RemoveStaticNoReference.java
new file mode 100644
index 0000000000..eda5df057e
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/RemoveStaticNoReference.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class RemoveStaticNoReference {
+
+	/**
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
+	public static String REMOVE_STATIC;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/RemoveTypeArguments.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/RemoveTypeArguments.java
new file mode 100644
index 0000000000..358f2f2a29
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/RemoveTypeArguments.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+import java.util.List;
+
+/**
+ *
+ */
+public class RemoveTypeArguments {
+
+	public List<String> FIELD;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/SpecializeType.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/SpecializeType.java
new file mode 100644
index 0000000000..6548a4bf0a
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/fields/modifiers/SpecializeType.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class SpecializeType {
+
+	public Object FIELD;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/members/AddField.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/members/AddField.java
new file mode 100644
index 0000000000..4604a5aaaf
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/members/AddField.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.members;
+
+/**
+ *
+ */
+public interface AddField {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/members/AddFieldNoImplement.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/members/AddFieldNoImplement.java
new file mode 100644
index 0000000000..e211a541ba
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/members/AddFieldNoImplement.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.members;
+
+/**
+ * @noimplement This interface is not intended to be implemented by clients.
+ */
+public interface AddFieldNoImplement {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/members/AddInterfaceA.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/members/AddInterfaceA.java
new file mode 100644
index 0000000000..943d614942
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/members/AddInterfaceA.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.members;
+
+/**
+ *
+ */
+public interface AddInterfaceA {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/members/AddInterfaceANoImplement.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/members/AddInterfaceANoImplement.java
new file mode 100644
index 0000000000..983deb54c9
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/members/AddInterfaceANoImplement.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.members;
+
+/**
+ * @noimplement This interface is not intended to be implemented by clients.
+ */
+public interface AddInterfaceANoImplement {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/members/AddMemberType.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/members/AddMemberType.java
new file mode 100644
index 0000000000..25a3bc4b1a
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/members/AddMemberType.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.members;
+
+/**
+ *
+ */
+public interface AddMemberType {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/members/AddMemberTypeNoImplement.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/members/AddMemberTypeNoImplement.java
new file mode 100644
index 0000000000..9764368802
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/members/AddMemberTypeNoImplement.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.members;
+
+/**
+ * @noimplement
+ */
+public interface AddMemberTypeNoImplement {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/members/AddMethod.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/members/AddMethod.java
new file mode 100644
index 0000000000..3c2489079d
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/members/AddMethod.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.members;
+
+/**
+ *
+ */
+public interface AddMethod {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/members/AddMethodNoImplement.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/members/AddMethodNoImplement.java
new file mode 100644
index 0000000000..f1853e94cf
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/members/AddMethodNoImplement.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.members;
+
+/**
+ * @noimplement This interface is not intended to be implemented by clients.
+ */
+public interface AddMethodNoImplement {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/members/ReduceFromABtoA.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/members/ReduceFromABtoA.java
new file mode 100644
index 0000000000..658662c474
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/members/ReduceFromABtoA.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.members;
+
+import a.classes.hierarchy.InterfaceA;
+import a.classes.hierarchy.InterfaceB;
+
+/**
+ *
+ */
+public interface ReduceFromABtoA extends InterfaceA, InterfaceB {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/members/ReduceFromABtoEmpty.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/members/ReduceFromABtoEmpty.java
new file mode 100644
index 0000000000..377bf8ca5c
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/members/ReduceFromABtoEmpty.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.members;
+
+import a.classes.hierarchy.InterfaceA;
+import a.classes.hierarchy.InterfaceB;
+
+/**
+ *
+ */
+public interface ReduceFromABtoEmpty extends InterfaceA, InterfaceB {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/members/RemoveField.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/members/RemoveField.java
new file mode 100644
index 0000000000..5c4a7b7bfe
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/members/RemoveField.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.members;
+
+/**
+ *
+ */
+public interface RemoveField {
+
+	public static final String FIELD = "FIELD";
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/members/RemoveMemberType.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/members/RemoveMemberType.java
new file mode 100644
index 0000000000..91347ea3ae
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/members/RemoveMemberType.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.members;
+
+/**
+ *
+ */
+public interface RemoveMemberType {
+
+	public interface MemberType {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/members/RemoveMethod.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/members/RemoveMethod.java
new file mode 100644
index 0000000000..a1631aac1f
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/members/RemoveMethod.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.members;
+
+/**
+ *
+ */
+public interface RemoveMethod {
+
+	public int removeMethod(String foo);
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/members/RemoveMethodNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/members/RemoveMethodNoReference.java
new file mode 100644
index 0000000000..aae9704ada
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/members/RemoveMethodNoReference.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.members;
+
+/**
+ *
+ */
+public interface RemoveMethodNoReference {
+
+	/**
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	public int noReference(String foo);
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/restrictions/AddNoImplement.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/restrictions/AddNoImplement.java
new file mode 100644
index 0000000000..1dc6f8b1b7
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/restrictions/AddNoImplement.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.restrictions;
+
+/**
+ *
+ */
+public interface AddNoImplement {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/restrictions/RemoveNoImplement.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/restrictions/RemoveNoImplement.java
new file mode 100644
index 0000000000..3112aee2e3
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/restrictions/RemoveNoImplement.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.restrictions;
+
+/**
+ * @noimplement
+ */
+public interface RemoveNoImplement {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/typeparameters/AddClassBound.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/typeparameters/AddClassBound.java
new file mode 100644
index 0000000000..7dfe539539
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/typeparameters/AddClassBound.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.typeparameters;
+
+/**
+ *
+ */
+public interface AddClassBound<E> {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/typeparameters/AddFirstTypeParameter.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/typeparameters/AddFirstTypeParameter.java
new file mode 100644
index 0000000000..813167b836
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/typeparameters/AddFirstTypeParameter.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.typeparameters;
+
+/**
+ *
+ */
+public interface AddFirstTypeParameter {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/typeparameters/AddInterfaceBound.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/typeparameters/AddInterfaceBound.java
new file mode 100644
index 0000000000..569a4f0f44
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/typeparameters/AddInterfaceBound.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.typeparameters;
+
+/**
+ *
+ */
+public interface AddInterfaceBound<E> {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/typeparameters/AddTypeParameter.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/typeparameters/AddTypeParameter.java
new file mode 100644
index 0000000000..b37f4c9490
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/typeparameters/AddTypeParameter.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.typeparameters;
+
+/**
+ *
+ */
+public interface AddTypeParameter<E> {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/typeparameters/ChangeClassBound.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/typeparameters/ChangeClassBound.java
new file mode 100644
index 0000000000..642ed59412
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/typeparameters/ChangeClassBound.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.typeparameters;
+
+import a.classes.typeparameters.Bound;
+
+/**
+ *
+ */
+public interface ChangeClassBound<E extends Bound> {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/typeparameters/ChangeInterfaceBound.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/typeparameters/ChangeInterfaceBound.java
new file mode 100644
index 0000000000..3baee6caa4
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/typeparameters/ChangeInterfaceBound.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.typeparameters;
+
+import a.classes.typeparameters.IBound;
+
+/**
+ *
+ */
+public interface ChangeInterfaceBound<E extends IBound> {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/typeparameters/RemoveClassBound.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/typeparameters/RemoveClassBound.java
new file mode 100644
index 0000000000..e93ec4bd34
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/typeparameters/RemoveClassBound.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.typeparameters;
+
+import a.classes.typeparameters.Bound;
+
+/**
+ *
+ */
+public interface RemoveClassBound<E extends Bound> {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/typeparameters/RemoveInterfaceBound.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/typeparameters/RemoveInterfaceBound.java
new file mode 100644
index 0000000000..4b9aa36691
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/typeparameters/RemoveInterfaceBound.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.typeparameters;
+
+import a.classes.typeparameters.IBound;
+
+/**
+ *
+ */
+public interface RemoveInterfaceBound<E extends IBound> {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/typeparameters/RemoveSecondInterfaceBound.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/typeparameters/RemoveSecondInterfaceBound.java
new file mode 100644
index 0000000000..404c788ba1
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/typeparameters/RemoveSecondInterfaceBound.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.typeparameters;
+
+import a.classes.typeparameters.IBound;
+import a.classes.typeparameters.IBoundTwo;
+
+/**
+ *
+ */
+public interface RemoveSecondInterfaceBound<E extends IBound & IBoundTwo>{
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/typeparameters/RemoveTypeParameter.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/typeparameters/RemoveTypeParameter.java
new file mode 100644
index 0000000000..fbb8e5aa1e
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/interfaces/typeparameters/RemoveTypeParameter.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.typeparameters;
+
+/**
+ *
+ */
+public interface RemoveTypeParameter<E> {
+
+	public void add(E e);
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/AddAbstract.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/AddAbstract.java
new file mode 100644
index 0000000000..d3a560eb06
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/AddAbstract.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ *
+ */
+public abstract class AddAbstract {
+
+	public void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/AddFinal.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/AddFinal.java
new file mode 100644
index 0000000000..29c0db3741
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/AddFinal.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ *
+ */
+public class AddFinal {
+
+	public void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/AddFinalNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/AddFinalNoExtend.java
new file mode 100644
index 0000000000..1dc2065b50
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/AddFinalNoExtend.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class AddFinalNoExtend {
+
+	public void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/AddFinalNoOverride.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/AddFinalNoOverride.java
new file mode 100644
index 0000000000..2f29a15977
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/AddFinalNoOverride.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ *
+ */
+public class AddFinalNoOverride {
+
+	/**
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 */
+	public void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/AddFinalRemoveNoOverride.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/AddFinalRemoveNoOverride.java
new file mode 100644
index 0000000000..8f48564049
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/AddFinalRemoveNoOverride.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ *
+ */
+public class AddFinalRemoveNoOverride {
+
+	/**
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 */
+	public void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/AddNoOverride.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/AddNoOverride.java
new file mode 100644
index 0000000000..15d0aeb3b9
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/AddNoOverride.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ *
+ */
+public class AddNoOverride {
+
+	public void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/AddNoOverrideToFinal.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/AddNoOverrideToFinal.java
new file mode 100644
index 0000000000..96eba3681c
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/AddNoOverrideToFinal.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ *
+ */
+public class AddNoOverrideToFinal {
+
+	public final void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/AddNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/AddNoReference.java
new file mode 100644
index 0000000000..e47a3e31cb
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/AddNoReference.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ *
+ */
+public class AddNoReference {
+
+	public void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/AddStatic.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/AddStatic.java
new file mode 100644
index 0000000000..97dd444927
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/AddStatic.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ *
+ */
+public class AddStatic {
+
+	public void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/AddStaticNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/AddStaticNoReference.java
new file mode 100644
index 0000000000..16416ee5de
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/AddStaticNoReference.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ *
+ */
+public class AddStaticNoReference {
+
+	/**
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	public void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/PrivateToPublicNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/PrivateToPublicNoReference.java
new file mode 100644
index 0000000000..21f310bf59
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/PrivateToPublicNoReference.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ *
+ */
+public class PrivateToPublicNoReference {
+	
+	private void method(int x) {}
+	
+	void otherMethod() {
+		method(1);
+	}
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/ProtectedToPackage.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/ProtectedToPackage.java
new file mode 100644
index 0000000000..613115889d
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/ProtectedToPackage.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ *
+ */
+public class ProtectedToPackage {
+
+	protected void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/ProtectedToPackageNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/ProtectedToPackageNoReference.java
new file mode 100644
index 0000000000..8406ce619c
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/ProtectedToPackageNoReference.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ *
+ */
+public class ProtectedToPackageNoReference {
+
+	/**
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	protected void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/ProtectedToPrivate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/ProtectedToPrivate.java
new file mode 100644
index 0000000000..d3b5aee942
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/ProtectedToPrivate.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ *
+ */
+public class ProtectedToPrivate {
+
+	protected void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/ProtectedToPrivateNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/ProtectedToPrivateNoExtend.java
new file mode 100644
index 0000000000..b95e91e7df
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/ProtectedToPrivateNoExtend.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class ProtectedToPrivateNoExtend {
+
+	protected void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/ProtectedToPrivateNoOverride.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/ProtectedToPrivateNoOverride.java
new file mode 100644
index 0000000000..91949e67ac
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/ProtectedToPrivateNoOverride.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ * 
+ */
+public class ProtectedToPrivateNoOverride {
+
+	/**
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 */
+	protected void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/PublicToPackage.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/PublicToPackage.java
new file mode 100644
index 0000000000..ff1a8f914b
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/PublicToPackage.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ *
+ */
+public class PublicToPackage {
+
+	public void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/PublicToPrivate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/PublicToPrivate.java
new file mode 100644
index 0000000000..7a0dba94aa
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/PublicToPrivate.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ *
+ */
+public class PublicToPrivate {
+	
+	public void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/PublicToPrivateNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/PublicToPrivateNoReference.java
new file mode 100644
index 0000000000..66a681eab4
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/PublicToPrivateNoReference.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ *
+ */
+public class PublicToPrivateNoReference {
+	
+	/**
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	public void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/PublicToProtected.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/PublicToProtected.java
new file mode 100644
index 0000000000..55eea97b72
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/PublicToProtected.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ *
+ */
+public class PublicToProtected {
+
+	public void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/RemoveNoOverride.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/RemoveNoOverride.java
new file mode 100644
index 0000000000..8a07f169b0
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/RemoveNoOverride.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ *
+ */
+public class RemoveNoOverride {
+
+	/**
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 */
+	public void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/RemoveNoOverrideToFinal.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/RemoveNoOverrideToFinal.java
new file mode 100644
index 0000000000..d6c6fe7439
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/RemoveNoOverrideToFinal.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ *
+ */
+public class RemoveNoOverrideToFinal {
+
+	/**
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 */
+	public final void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/RemoveStatic.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/RemoveStatic.java
new file mode 100644
index 0000000000..19a5949d67
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/RemoveStatic.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ *
+ */
+public class RemoveStatic {
+
+	public static void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/RemoveStaticNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/RemoveStaticNoReference.java
new file mode 100644
index 0000000000..b9ed937181
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/modifiers/RemoveStaticNoReference.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ *
+ */
+public class RemoveStaticNoReference {
+
+	/**
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	public static void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/typeparameters/AddTypeParameter.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/typeparameters/AddTypeParameter.java
new file mode 100644
index 0000000000..058cf09a99
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/typeparameters/AddTypeParameter.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.typeparameters;
+
+/**
+ *
+ */
+public class AddTypeParameter {
+
+	public <T> void method(T t) {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/typeparameters/ArrayToVarArgs.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/typeparameters/ArrayToVarArgs.java
new file mode 100644
index 0000000000..4bfd8c2e98
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/typeparameters/ArrayToVarArgs.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.typeparameters;
+
+/**
+ *
+ */
+public class ArrayToVarArgs {
+
+	public void method(int x, int[] args) {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/typeparameters/RemoveTypeParameter.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/typeparameters/RemoveTypeParameter.java
new file mode 100644
index 0000000000..c744162ea0
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/typeparameters/RemoveTypeParameter.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.typeparameters;
+
+/**
+ *
+ */
+public class RemoveTypeParameter {
+
+	public <T, U> void method(T t) {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/typeparameters/VarArgsToArray.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/typeparameters/VarArgsToArray.java
new file mode 100644
index 0000000000..a6458f030a
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/methods/typeparameters/VarArgsToArray.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.typeparameters;
+
+/**
+ *
+ */
+public class VarArgsToArray {
+
+	public void method(int x, int... args) {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/AddField.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/AddField.java
new file mode 100644
index 0000000000..9b1b56e9d5
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/AddField.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.since;
+
+/**
+ *
+ */
+public class AddField {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/AddInheritedMethod.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/AddInheritedMethod.java
new file mode 100644
index 0000000000..484b49a76e
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/AddInheritedMethod.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.since;
+
+/**
+ *
+ */
+public class AddInheritedMethod {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/AddMemberType.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/AddMemberType.java
new file mode 100644
index 0000000000..0b0def2ffb
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/AddMemberType.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.since;
+
+/**
+ *
+ */
+public class AddMemberType {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/AddMethod.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/AddMethod.java
new file mode 100644
index 0000000000..7f16c84d34
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/AddMethod.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.since;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class AddMethod {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/AddNewInterfaceMethod.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/AddNewInterfaceMethod.java
new file mode 100644
index 0000000000..1802fd1b56
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/AddNewInterfaceMethod.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.since;
+
+/**
+ *
+ */
+public class AddNewInterfaceMethod {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/AddNonVisibleMethod.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/AddNonVisibleMethod.java
new file mode 100644
index 0000000000..08cac41422
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/AddNonVisibleMethod.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.since;
+
+/**
+ *
+ */
+public final class AddNonVisibleMethod {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/AddPrivateField.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/AddPrivateField.java
new file mode 100644
index 0000000000..48aa11eb2e
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/AddPrivateField.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.since;
+
+/**
+ *
+ */
+public class AddPrivateField {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/InvalidField.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/InvalidField.java
new file mode 100644
index 0000000000..11be42e0f5
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/InvalidField.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.since;
+
+/**
+ *
+ */
+public class InvalidField {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/InvalidMemberType.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/InvalidMemberType.java
new file mode 100644
index 0000000000..ccc01c98b9
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/InvalidMemberType.java
@@ -0,0 +1,17 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.since;
+/**
+ *
+ */
+public class InvalidMemberType {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/InvalidMethod.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/InvalidMethod.java
new file mode 100644
index 0000000000..4a282c131b
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/InvalidMethod.java
@@ -0,0 +1,17 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.since;
+/**
+ *
+ */
+public class InvalidMethod {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/MalformedField.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/MalformedField.java
new file mode 100644
index 0000000000..6cbaacd29d
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/MalformedField.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.since;
+
+/**
+ *
+ */
+public class MalformedField {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/MalformedMemberType.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/MalformedMemberType.java
new file mode 100644
index 0000000000..337e60ae79
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/MalformedMemberType.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.since;
+
+/**
+ *
+ */
+public class MalformedMemberType {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/MalformedMethod.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/MalformedMethod.java
new file mode 100644
index 0000000000..1dadbb8155
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/MalformedMethod.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.since;
+
+/**
+ *
+ */
+public class MalformedMethod {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/MalformedTag.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/MalformedTag.java
new file mode 100644
index 0000000000..e07fb0d807
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/MalformedTag.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.since;
+
+/**
+ *
+ */
+public class MalformedTag {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/ValidSinceTags.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/ValidSinceTags.java
new file mode 100644
index 0000000000..f658bcf4ef
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/since/ValidSinceTags.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.since;
+
+/**
+ *
+ */
+public class ValidSinceTags {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/version/AddApi.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/version/AddApi.java
new file mode 100644
index 0000000000..3fec112c02
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/version/AddApi.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.version;
+
+/**
+ *
+ */
+public class AddApi {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/version/BreakApi.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/version/BreakApi.java
new file mode 100644
index 0000000000..2dd0d61b5b
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/version/BreakApi.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.version;
+
+/**
+ *
+ */
+public class BreakApi {
+	
+	public void method() {}
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/version/StableApi.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/version/StableApi.java
new file mode 100644
index 0000000000..46a7818968
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/version/StableApi.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.version;
+
+/**
+ *
+ */
+public class StableApi {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/version/internal/RemoveInternalClass.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/version/internal/RemoveInternalClass.java
new file mode 100644
index 0000000000..44c424c176
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/baseline/bundle.a/src/a/version/internal/RemoveInternalClass.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.version.internal;
+
+/**
+ *
+ */
+public class RemoveInternalClass {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/annotations/AddMethodwDef.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/annotations/AddMethodwDef.java
new file mode 100644
index 0000000000..e6ae3100d6
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/annotations/AddMethodwDef.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.annotations;
+
+/**
+ *
+ */
+public @interface AddMethodwDef {
+
+	public int method() default 42;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/annotations/AddMethodwoDef.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/annotations/AddMethodwoDef.java
new file mode 100644
index 0000000000..1d0505e6ce
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/annotations/AddMethodwoDef.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.annotations;
+
+/**
+ *
+ */
+public @interface AddMethodwoDef {
+
+	public int method();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/annotations/RemoveDefValue.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/annotations/RemoveDefValue.java
new file mode 100644
index 0000000000..f8430af1d9
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/annotations/RemoveDefValue.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.annotations;
+
+/**
+ *
+ */
+public @interface RemoveDefValue {
+
+	public int method();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/annotations/RemoveField.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/annotations/RemoveField.java
new file mode 100644
index 0000000000..dce0f9207b
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/annotations/RemoveField.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.annotations;
+
+/**
+ *
+ */
+public @interface RemoveField {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/annotations/RemoveMemberType.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/annotations/RemoveMemberType.java
new file mode 100644
index 0000000000..ea5e89dd23
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/annotations/RemoveMemberType.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.annotations;
+
+/**
+ *
+ */
+public @interface RemoveMemberType {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/annotations/RemoveMethod.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/annotations/RemoveMethod.java
new file mode 100644
index 0000000000..0b52f0e481
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/annotations/RemoveMethod.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.annotations;
+
+/**
+ *
+ */
+public @interface RemoveMethod {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/annotations/ToClass.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/annotations/ToClass.java
new file mode 100644
index 0000000000..54be2a289f
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/annotations/ToClass.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.annotations;
+
+/**
+ *
+ */
+public class ToClass {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/annotations/ToEnum.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/annotations/ToEnum.java
new file mode 100644
index 0000000000..7a1a8e83fa
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/annotations/ToEnum.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.annotations;
+
+/**
+ *
+ */
+public enum ToEnum {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/annotations/ToInterface.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/annotations/ToInterface.java
new file mode 100644
index 0000000000..1a7e66de38
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/annotations/ToInterface.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.annotations;
+
+/**
+ *
+ */
+public interface ToInterface {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/bundles/DeleteAndReplace.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/bundles/DeleteAndReplace.java
new file mode 100644
index 0000000000..e11df8ffa3
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/bundles/DeleteAndReplace.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.bundles;
+
+/**
+ *
+ */
+public class DeleteAndReplace {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/bundles/PublicToPackageVisibility.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/bundles/PublicToPackageVisibility.java
new file mode 100644
index 0000000000..ff119106b8
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/bundles/PublicToPackageVisibility.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.bundles;
+
+/**
+ *
+ */
+class PublicToPackageVisibility {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/AddPrivateConstructor.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/AddPrivateConstructor.java
new file mode 100644
index 0000000000..97964fe652
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/AddPrivateConstructor.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.constructors;
+
+/**
+ * Tests add a private constructor.
+ */
+public class AddPrivateConstructor {
+	
+	public AddPrivateConstructor(String foo) {
+		
+	}
+	
+	public int publicMethod(String arg) {
+		return -1;
+	}
+	
+	private AddPrivateConstructor(int i) {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/AddProtectedConstructor.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/AddProtectedConstructor.java
new file mode 100644
index 0000000000..2c830a906f
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/AddProtectedConstructor.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.constructors;
+
+/**
+ * Tests add a protected constructor.
+ */
+public class AddProtectedConstructor {
+	
+	protected AddProtectedConstructor(String foo) {
+		
+	}
+
+	public int publicMethod(String arg) {
+		return -1;
+	}
+	
+	protected AddProtectedConstructor(int i) {
+		
+	}
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/AddPublicConstructor.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/AddPublicConstructor.java
new file mode 100644
index 0000000000..b76681252c
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/AddPublicConstructor.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.constructors;
+
+/**
+ * Tests add a public constructor.
+ */
+public class AddPublicConstructor {
+	
+	public AddPublicConstructor(String foo) {
+		
+	}
+
+	public int publicMethod(String arg) {
+		return -1;
+	}
+	
+	public AddPublicConstructor(int i) {
+		
+	}
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/AddSinglePrivateConstructor.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/AddSinglePrivateConstructor.java
new file mode 100644
index 0000000000..293dd23c97
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/AddSinglePrivateConstructor.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.constructors;
+
+/**
+ * Tests add a private constructor.
+ */
+public class AddSinglePrivateConstructor {
+	
+	public int publicMethod(String arg) {
+		return -1;
+	}
+	
+	private AddSinglePrivateConstructor(int i) {
+		
+	}
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/AddSingleProtectedConstructor.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/AddSingleProtectedConstructor.java
new file mode 100644
index 0000000000..2b01fa334c
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/AddSingleProtectedConstructor.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.constructors;
+
+/**
+ * Tests add a protected constructor.
+ */
+public class AddSingleProtectedConstructor {
+	
+	public int publicMethod(String arg) {
+		return -1;
+	}
+	
+	protected AddSingleProtectedConstructor(int i) {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/AddSinglePublicConstructor.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/AddSinglePublicConstructor.java
new file mode 100644
index 0000000000..d2992b24b9
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/AddSinglePublicConstructor.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.constructors;
+
+/**
+ * Tests add a public constructor.
+ */
+public class AddSinglePublicConstructor {
+	
+	public int publicMethod(String arg) {
+		return -1;
+	}
+	
+	public AddSinglePublicConstructor(int i) {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemovePackageConstructor.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemovePackageConstructor.java
new file mode 100644
index 0000000000..5c03ede3ad
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemovePackageConstructor.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.constructors;
+
+/**
+ * Tests removing package protected constructor.
+ */
+public class RemovePackageConstructor {
+	
+	RemovePackageConstructor(String foo) {
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemovePrivateConstructor.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemovePrivateConstructor.java
new file mode 100644
index 0000000000..ba301abe76
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemovePrivateConstructor.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.constructors;
+
+/**
+ * Tests removing private constructor.
+ */
+public class RemovePrivateConstructor {
+	
+	private RemovePrivateConstructor(String foo) {
+	}
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemoveProtectedConstructor.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemoveProtectedConstructor.java
new file mode 100644
index 0000000000..6117924042
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemoveProtectedConstructor.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.constructors;
+
+/**
+ * Tests removing a protected API constructor.
+ */
+public class RemoveProtectedConstructor {
+	
+	protected RemoveProtectedConstructor(String foo) {
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemoveProtectedConstructorNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemoveProtectedConstructorNoExtend.java
new file mode 100644
index 0000000000..2ff6d627ae
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemoveProtectedConstructorNoExtend.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.constructors;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class RemoveProtectedConstructorNoExtend {
+	
+	protected RemoveProtectedConstructorNoExtend(String foo) {
+	}
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemoveProtectedConstructorNoExtendNoInstantiate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemoveProtectedConstructorNoExtendNoInstantiate.java
new file mode 100644
index 0000000000..81330be93c
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemoveProtectedConstructorNoExtendNoInstantiate.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.constructors;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class RemoveProtectedConstructorNoExtendNoInstantiate {
+	
+	protected RemoveProtectedConstructorNoExtendNoInstantiate(String foo) {
+	}
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemoveProtectedConstructorNoInstantiate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemoveProtectedConstructorNoInstantiate.java
new file mode 100644
index 0000000000..32431f39c4
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemoveProtectedConstructorNoInstantiate.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.constructors;
+
+/**
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class RemoveProtectedConstructorNoInstantiate {
+	
+	protected RemoveProtectedConstructorNoInstantiate(String foo) {
+		
+	}	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemoveProtectedConstructorNoOverride.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemoveProtectedConstructorNoOverride.java
new file mode 100644
index 0000000000..7bcc7723fd
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemoveProtectedConstructorNoOverride.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.constructors;
+
+/**
+ * 
+ */
+public class RemoveProtectedConstructorNoOverride {
+	
+	/**
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 */
+	protected RemoveProtectedConstructorNoOverride(String foo) {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemoveProtectedConstructorNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemoveProtectedConstructorNoReference.java
new file mode 100644
index 0000000000..456d001941
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemoveProtectedConstructorNoReference.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.constructors;
+
+/**
+ * 
+ */
+public class RemoveProtectedConstructorNoReference {
+	
+	/**
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	protected RemoveProtectedConstructorNoReference(String foo) {
+		
+	}	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemovePublicConstructor.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemovePublicConstructor.java
new file mode 100644
index 0000000000..00f8115659
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemovePublicConstructor.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.constructors;
+
+/**
+ * Tests removing an API constructor.
+ */
+public class RemovePublicConstructor {
+	
+	public RemovePublicConstructor(String foo) {
+		
+	}
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemovePublicConstructorNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemovePublicConstructorNoExtend.java
new file mode 100644
index 0000000000..ae34d38363
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemovePublicConstructorNoExtend.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.constructors;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class RemovePublicConstructorNoExtend {
+	
+	public RemovePublicConstructorNoExtend(String foo) {
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemovePublicConstructorNoExtendNoInstantiate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemovePublicConstructorNoExtendNoInstantiate.java
new file mode 100644
index 0000000000..712e9fa7cf
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemovePublicConstructorNoExtendNoInstantiate.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.constructors;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class RemovePublicConstructorNoExtendNoInstantiate {
+	
+	public RemovePublicConstructorNoExtendNoInstantiate(String foo) {
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemovePublicConstructorNoInstantiate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemovePublicConstructorNoInstantiate.java
new file mode 100644
index 0000000000..afa8da5e9a
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemovePublicConstructorNoInstantiate.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.constructors;
+
+/**
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class RemovePublicConstructorNoInstantiate {
+	
+	public RemovePublicConstructorNoInstantiate(String foo) {
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemovePublicConstructorNoOverride.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemovePublicConstructorNoOverride.java
new file mode 100644
index 0000000000..df844c2f46
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemovePublicConstructorNoOverride.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.constructors;
+
+/**
+ * 
+ */
+public class RemovePublicConstructorNoOverride {
+	
+	/**
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 */
+	public RemovePublicConstructorNoOverride(String foo) {
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemovePublicConstructorNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemovePublicConstructorNoReference.java
new file mode 100644
index 0000000000..9bb0dd4816
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemovePublicConstructorNoReference.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.constructors;
+
+/**
+ * 
+ */
+public class RemovePublicConstructorNoReference {
+	
+	/**
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	public RemovePublicConstructorNoReference(String foo) {
+	}	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemoveTwoPublicConstructors.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemoveTwoPublicConstructors.java
new file mode 100644
index 0000000000..590db40520
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/constructors/RemoveTwoPublicConstructors.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.constructors;
+
+/**
+ * Tests removing constructors.
+ */
+public class RemoveTwoPublicConstructors {
+		
+}
+
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/AddPrivateField.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/AddPrivateField.java
new file mode 100644
index 0000000000..5018c59498
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/AddPrivateField.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.fields;
+
+/**
+ * Tests adding private field.
+ */
+public class AddPrivateField {
+
+	private String PRIVATE_FIELD = "FOO";
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/AddProtectedField.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/AddProtectedField.java
new file mode 100644
index 0000000000..9faaa41a36
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/AddProtectedField.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.fields;
+
+/**
+ * Tests adding protected field.
+ */
+public class AddProtectedField {
+	
+	protected String PROTECTED_FIELD = "FOO";
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/AddPublicField.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/AddPublicField.java
new file mode 100644
index 0000000000..c04d8cf451
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/AddPublicField.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.fields;
+
+/**
+ * Tests adding public field.
+ */
+public class AddPublicField {
+
+	public String PUBLIC_FIELD = "FOO";
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/RemovePackageField.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/RemovePackageField.java
new file mode 100644
index 0000000000..21057759ac
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/RemovePackageField.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.fields;
+
+/**
+ * Tests removing package protected field.
+ */
+public class RemovePackageField {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/RemovePrivateField.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/RemovePrivateField.java
new file mode 100644
index 0000000000..f66e710405
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/RemovePrivateField.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.fields;
+
+/**
+ * Tests removing private field.
+ */
+public class RemovePrivateField {
+	
+	public String get() {
+		return "FOO";
+	}
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/RemoveProtectedField.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/RemoveProtectedField.java
new file mode 100644
index 0000000000..5a6e3e4813
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/RemoveProtectedField.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.fields;
+
+/**
+ * Tests removing protected field.
+ */
+public class RemoveProtectedField {
+
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/RemoveProtectedFieldNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/RemoveProtectedFieldNoExtend.java
new file mode 100644
index 0000000000..0e45f73286
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/RemoveProtectedFieldNoExtend.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.fields;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class RemoveProtectedFieldNoExtend {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/RemoveProtectedFieldNoExtendNoInstantiate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/RemoveProtectedFieldNoExtendNoInstantiate.java
new file mode 100644
index 0000000000..c605ae0906
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/RemoveProtectedFieldNoExtendNoInstantiate.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.fields;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class RemoveProtectedFieldNoExtendNoInstantiate {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/RemoveProtectedFieldNoInstantiate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/RemoveProtectedFieldNoInstantiate.java
new file mode 100644
index 0000000000..9749747f98
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/RemoveProtectedFieldNoInstantiate.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.fields;
+
+/**
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class RemoveProtectedFieldNoInstantiate {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/RemoveProtectedFieldNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/RemoveProtectedFieldNoReference.java
new file mode 100644
index 0000000000..95976c957c
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/RemoveProtectedFieldNoReference.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.fields;
+
+/**
+ * Tests removing protected field.
+ */
+public class RemoveProtectedFieldNoReference {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/RemovePublicField.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/RemovePublicField.java
new file mode 100644
index 0000000000..5495858847
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/RemovePublicField.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.fields;
+
+/**
+ * Tests removing public field.
+ */
+public class RemovePublicField {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/RemovePublicFieldNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/RemovePublicFieldNoExtend.java
new file mode 100644
index 0000000000..e044e5128a
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/RemovePublicFieldNoExtend.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.fields;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class RemovePublicFieldNoExtend {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/RemovePublicFieldNoExtendNoInstantiate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/RemovePublicFieldNoExtendNoInstantiate.java
new file mode 100644
index 0000000000..a932bd8e87
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/RemovePublicFieldNoExtendNoInstantiate.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.fields;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class RemovePublicFieldNoExtendNoInstantiate {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/RemovePublicFieldNoInstantiate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/RemovePublicFieldNoInstantiate.java
new file mode 100644
index 0000000000..d90c94e3f1
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/RemovePublicFieldNoInstantiate.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.fields;
+
+/**
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class RemovePublicFieldNoInstantiate {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/RemovePublicFieldNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/RemovePublicFieldNoReference.java
new file mode 100644
index 0000000000..10bd53e7c1
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/RemovePublicFieldNoReference.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.fields;
+
+/**
+ * Tests removing public field.
+ */
+public class RemovePublicFieldNoReference {
+
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/RemoveTwoPublicFields.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/RemoveTwoPublicFields.java
new file mode 100644
index 0000000000..f6e11ba133
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/fields/RemoveTwoPublicFields.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.fields;
+
+/**
+ * Tests removing public field.
+ */
+public class RemoveTwoPublicFields {
+
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/hierarchy/AddInterfaceA.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/hierarchy/AddInterfaceA.java
new file mode 100644
index 0000000000..5b073c3f31
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/hierarchy/AddInterfaceA.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.hierarchy;
+
+/**
+ *
+ */
+public class AddInterfaceA  implements InterfaceA {
+
+	/* (non-Javadoc)
+	 * @see a.classes.hierarchy.InterfaceA#methodA()
+	 */
+	public int methodA() {
+		return 0;
+	}
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/hierarchy/ChangeInterfaceFromAtoB.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/hierarchy/ChangeInterfaceFromAtoB.java
new file mode 100644
index 0000000000..c2f715ed6d
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/hierarchy/ChangeInterfaceFromAtoB.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.hierarchy;
+
+/**
+ *
+ */
+public class ChangeInterfaceFromAtoB implements InterfaceB {
+
+	/* (non-Javadoc)
+	 * @see a.classes.hierarchy.InterfaceA#methodA()
+	 */
+	public int methodA() {
+		return 0;
+	}
+
+	/* (non-Javadoc)
+	 * @see a.classes.hierarchy.InterfaceB#methodB()
+	 */
+	public String methodB() {
+		return null;
+	}
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/hierarchy/ChangedFromAtoD.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/hierarchy/ChangedFromAtoD.java
new file mode 100644
index 0000000000..5f80efe97b
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/hierarchy/ChangedFromAtoD.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.hierarchy;
+
+/**
+ *
+ */
+public class ChangedFromAtoD extends ClassD {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/hierarchy/ReduceFromCtoA.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/hierarchy/ReduceFromCtoA.java
new file mode 100644
index 0000000000..f17ed26b6e
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/hierarchy/ReduceFromCtoA.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.hierarchy;
+
+/**
+ * Reduce superclass from C to A
+ */
+public class ReduceFromCtoA extends ClassA {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/hierarchy/ReduceFromCtoB.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/hierarchy/ReduceFromCtoB.java
new file mode 100644
index 0000000000..0f32da5e35
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/hierarchy/ReduceFromCtoB.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.hierarchy;
+
+/**
+ * Reduce superclass from C to B
+ */
+public class ReduceFromCtoB extends ClassB {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/hierarchy/ReduceFromCtoObject.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/hierarchy/ReduceFromCtoObject.java
new file mode 100644
index 0000000000..0003f1b09e
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/hierarchy/ReduceFromCtoObject.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.hierarchy;
+
+/**
+ * Reduce super class from C to Object
+ */
+public class ReduceFromCtoObject {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/hierarchy/ReduceInterfaceFromABtoA.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/hierarchy/ReduceInterfaceFromABtoA.java
new file mode 100644
index 0000000000..91489f637a
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/hierarchy/ReduceInterfaceFromABtoA.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.hierarchy;
+
+/**
+ *
+ */
+public class ReduceInterfaceFromABtoA implements InterfaceA {
+
+	/* (non-Javadoc)
+	 * @see a.classes.hierarchy.InterfaceA#methodA()
+	 */
+	public int methodA() {
+		return 0;
+	}
+
+	/* (non-Javadoc)
+	 * @see a.classes.hierarchy.InterfaceB#methodB()
+	 */
+	public String methodB() {
+		return null;
+	}
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/hierarchy/ReduceInterfaceFromABtoEmpty.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/hierarchy/ReduceInterfaceFromABtoEmpty.java
new file mode 100644
index 0000000000..26cac44e33
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/hierarchy/ReduceInterfaceFromABtoEmpty.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.hierarchy;
+
+/**
+ *
+ */
+public class ReduceInterfaceFromABtoEmpty {
+
+	/* (non-Javadoc)
+	 * @see a.classes.hierarchy.InterfaceA#methodA()
+	 */
+	public int methodA() {
+		return 0;
+	}
+
+	/* (non-Javadoc)
+	 * @see a.classes.hierarchy.InterfaceB#methodB()
+	 */
+	public String methodB() {
+		return null;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/hierarchy/RemoveIntSuperClassWithMethod.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/hierarchy/RemoveIntSuperClassWithMethod.java
new file mode 100644
index 0000000000..265d11113a
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/hierarchy/RemoveIntSuperClassWithMethod.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.hierarchy;
+
+/**
+ *
+ */
+public class RemoveIntSuperClassWithMethod {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/hierarchy/RemoveInternalSuperClass.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/hierarchy/RemoveInternalSuperClass.java
new file mode 100644
index 0000000000..dafb77ee51
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/hierarchy/RemoveInternalSuperClass.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.hierarchy;
+
+import a.classes.internal.InternalClass;
+
+/**
+ *
+ */
+public class RemoveInternalSuperClass  {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/hierarchy/SubClazz.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/hierarchy/SubClazz.java
new file mode 100644
index 0000000000..7ee6ee0fd4
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/hierarchy/SubClazz.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.hierarchy;
+
+/**
+ *
+ */
+public class SubClazz extends SuperClazz {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/hierarchy/SuperClazz.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/hierarchy/SuperClazz.java
new file mode 100644
index 0000000000..e1b08db17a
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/hierarchy/SuperClazz.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.hierarchy;
+
+/**
+ *
+ */
+public class SuperClazz {
+
+	public void pushUp() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/internal/RemoveInternalConstructor.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/internal/RemoveInternalConstructor.java
new file mode 100644
index 0000000000..d379bc464e
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/internal/RemoveInternalConstructor.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.internal;
+
+/**
+ *
+ */
+public class RemoveInternalConstructor {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/internal/RemoveInternalMethod.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/internal/RemoveInternalMethod.java
new file mode 100644
index 0000000000..c6d7c54bdf
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/internal/RemoveInternalMethod.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.internal;
+
+/**
+ *
+ */
+public class RemoveInternalMethod {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/membertypes/PackageToPrivateVisibility.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/membertypes/PackageToPrivateVisibility.java
new file mode 100644
index 0000000000..351d5c723d
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/membertypes/PackageToPrivateVisibility.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.membertypes;
+
+/**
+ *
+ */
+public class PackageToPrivateVisibility {
+
+	private class PackageToPrivate {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/membertypes/ProtectedToPackageVisibility.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/membertypes/ProtectedToPackageVisibility.java
new file mode 100644
index 0000000000..d6550cb695
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/membertypes/ProtectedToPackageVisibility.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.membertypes;
+
+/**
+ *
+ */
+public class ProtectedToPackageVisibility {
+
+	class ProtectedToPackage {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/membertypes/ProtectedToPackageVisibilityNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/membertypes/ProtectedToPackageVisibilityNoExtend.java
new file mode 100644
index 0000000000..7d572a5758
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/membertypes/ProtectedToPackageVisibilityNoExtend.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.membertypes;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class ProtectedToPackageVisibilityNoExtend {
+
+	class ProtectedToPackage {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/membertypes/ProtectedToPrivateVisibility.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/membertypes/ProtectedToPrivateVisibility.java
new file mode 100644
index 0000000000..e803d3f155
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/membertypes/ProtectedToPrivateVisibility.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.membertypes;
+
+/**
+ *
+ */
+public class ProtectedToPrivateVisibility {
+
+	private class ProtectedToPrivate {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/membertypes/ProtectedToPrivateVisibilityNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/membertypes/ProtectedToPrivateVisibilityNoExtend.java
new file mode 100644
index 0000000000..d8600326eb
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/membertypes/ProtectedToPrivateVisibilityNoExtend.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.membertypes;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class ProtectedToPrivateVisibilityNoExtend {
+
+	private class ProtectedToPrivate {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/membertypes/PublicToPackageVisibility.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/membertypes/PublicToPackageVisibility.java
new file mode 100644
index 0000000000..4117019bdd
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/membertypes/PublicToPackageVisibility.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.membertypes;
+
+/**
+ *
+ */
+public class PublicToPackageVisibility {
+
+	class PublicToPackage {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/membertypes/PublicToPrivateVisibility.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/membertypes/PublicToPrivateVisibility.java
new file mode 100644
index 0000000000..11babfaacd
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/membertypes/PublicToPrivateVisibility.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.membertypes;
+
+/**
+ *
+ */
+public class PublicToPrivateVisibility {
+
+	private class PublicToPrivate {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/membertypes/PublicToProtectedVisibility.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/membertypes/PublicToProtectedVisibility.java
new file mode 100644
index 0000000000..8af49ea6f8
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/membertypes/PublicToProtectedVisibility.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.membertypes;
+
+/**
+ *
+ */
+public class PublicToProtectedVisibility {
+
+	protected class PublicToProtected {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/membertypes/RemovePackageMemberType.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/membertypes/RemovePackageMemberType.java
new file mode 100644
index 0000000000..2395544996
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/membertypes/RemovePackageMemberType.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.membertypes;
+
+/**
+ *
+ */
+public class RemovePackageMemberType {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/membertypes/RemovePrivateMemberType.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/membertypes/RemovePrivateMemberType.java
new file mode 100644
index 0000000000..ad973fcae5
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/membertypes/RemovePrivateMemberType.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.membertypes;
+
+/**
+ *
+ */
+public class RemovePrivateMemberType {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/membertypes/RemoveProtectedMemberType.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/membertypes/RemoveProtectedMemberType.java
new file mode 100644
index 0000000000..c348c90844
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/membertypes/RemoveProtectedMemberType.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.membertypes;
+
+/**
+ *
+ */
+public class RemoveProtectedMemberType {
+
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/membertypes/RemoveProtectedMemberTypeNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/membertypes/RemoveProtectedMemberTypeNoExtend.java
new file mode 100644
index 0000000000..3d3d70ea6e
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/membertypes/RemoveProtectedMemberTypeNoExtend.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.membertypes;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class RemoveProtectedMemberTypeNoExtend {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/membertypes/RemovePublicMemberType.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/membertypes/RemovePublicMemberType.java
new file mode 100644
index 0000000000..339e7e6234
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/membertypes/RemovePublicMemberType.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.membertypes;
+
+/**
+ *
+ */
+public class RemovePublicMemberType {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/AddAbstractMethod.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/AddAbstractMethod.java
new file mode 100644
index 0000000000..68d6f27fa9
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/AddAbstractMethod.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.methods;
+
+/**
+ *
+ */
+public abstract class AddAbstractMethod {
+
+	public abstract void method();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/AddAbstractMethodNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/AddAbstractMethodNoExtend.java
new file mode 100644
index 0000000000..e269335984
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/AddAbstractMethodNoExtend.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.methods;
+
+/**
+ * @noextend
+ */
+public abstract class AddAbstractMethodNoExtend {
+
+	public abstract void method();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/AddPrivateMethod.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/AddPrivateMethod.java
new file mode 100644
index 0000000000..19aaa826e2
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/AddPrivateMethod.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.methods;
+
+/**
+ * Tests add a private method.
+ */
+public class AddPrivateMethod {
+	
+	public int publicMethod(String arg) {
+		return -1;
+	}
+	
+	private int privateMethod(String arg) {
+		return -1;
+	}
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/AddProtectedMethod.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/AddProtectedMethod.java
new file mode 100644
index 0000000000..66d13d632b
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/AddProtectedMethod.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.methods;
+
+/**
+ * Tests add a protected method.
+ */
+public class AddProtectedMethod {
+	
+	public int publicMethod(String arg) {
+		return -1;
+	}
+	
+	protected int protectedMethod(String arg) {
+		return 42;
+	}
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/AddPublicMethod.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/AddPublicMethod.java
new file mode 100644
index 0000000000..d786d85d61
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/AddPublicMethod.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.methods;
+
+/**
+ * Tests add a public method.
+ */
+public class AddPublicMethod {
+	
+	public int publicMethod(String arg) {
+		return -1;
+	}
+	
+	public int publicMethod2(String arg) {
+		return -1;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemovePackageMethod.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemovePackageMethod.java
new file mode 100644
index 0000000000..fb658fcd14
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemovePackageMethod.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.methods;
+
+/**
+ * Tests removing package protected method.
+ */
+public class RemovePackageMethod {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemovePrivateMethod.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemovePrivateMethod.java
new file mode 100644
index 0000000000..3f50748ac0
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemovePrivateMethod.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.methods;
+
+/**
+ * Tests removing private method.
+ */
+public class RemovePrivateMethod {
+	
+	public int publicMethod(String arg) {
+		return -1;
+	}
+
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemoveProtectedMethod.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemoveProtectedMethod.java
new file mode 100644
index 0000000000..c321cca394
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemoveProtectedMethod.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.methods;
+
+/**
+ * Tests removing a protected API method.
+ */
+public class RemoveProtectedMethod {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemoveProtectedMethodNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemoveProtectedMethodNoExtend.java
new file mode 100644
index 0000000000..b47c8923ba
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemoveProtectedMethodNoExtend.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.methods;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class RemoveProtectedMethodNoExtend {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemoveProtectedMethodNoExtendNoInstantiate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemoveProtectedMethodNoExtendNoInstantiate.java
new file mode 100644
index 0000000000..55ad0b945c
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemoveProtectedMethodNoExtendNoInstantiate.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.methods;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class RemoveProtectedMethodNoExtendNoInstantiate {
+		
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemoveProtectedMethodNoInstantiate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemoveProtectedMethodNoInstantiate.java
new file mode 100644
index 0000000000..1c1e8ca277
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemoveProtectedMethodNoInstantiate.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.methods;
+
+/**
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class RemoveProtectedMethodNoInstantiate {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemoveProtectedMethodNoOverride.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemoveProtectedMethodNoOverride.java
new file mode 100644
index 0000000000..af325f5783
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemoveProtectedMethodNoOverride.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.methods;
+
+/**
+ * 
+ */
+public class RemoveProtectedMethodNoOverride {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemoveProtectedMethodNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemoveProtectedMethodNoReference.java
new file mode 100644
index 0000000000..5a84c93024
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemoveProtectedMethodNoReference.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.methods;
+
+/**
+ * 
+ */
+public class RemoveProtectedMethodNoReference {
+	
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemovePublicMethod.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemovePublicMethod.java
new file mode 100644
index 0000000000..e437efbc82
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemovePublicMethod.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.methods;
+
+/**
+ * Tests removing an API method.
+ */
+public class RemovePublicMethod {
+		
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemovePublicMethodNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemovePublicMethodNoExtend.java
new file mode 100644
index 0000000000..9f0067382d
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemovePublicMethodNoExtend.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.methods;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class RemovePublicMethodNoExtend {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemovePublicMethodNoExtendNoInstantiate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemovePublicMethodNoExtendNoInstantiate.java
new file mode 100644
index 0000000000..4dbb1edbaf
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemovePublicMethodNoExtendNoInstantiate.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.methods;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class RemovePublicMethodNoExtendNoInstantiate {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemovePublicMethodNoInstantiate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemovePublicMethodNoInstantiate.java
new file mode 100644
index 0000000000..25f3993ab2
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemovePublicMethodNoInstantiate.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.methods;
+
+/**
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class RemovePublicMethodNoInstantiate {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemovePublicMethodNoOverride.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemovePublicMethodNoOverride.java
new file mode 100644
index 0000000000..e6ef116ac1
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemovePublicMethodNoOverride.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.methods;
+
+/**
+ * 
+ */
+public class RemovePublicMethodNoOverride {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemovePublicMethodNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemovePublicMethodNoReference.java
new file mode 100644
index 0000000000..335169ad3c
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemovePublicMethodNoReference.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.methods;
+
+/**
+ * 
+ */
+public class RemovePublicMethodNoReference {
+
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemoveTwoPublicMethods.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemoveTwoPublicMethods.java
new file mode 100644
index 0000000000..44a40b9a67
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/methods/RemoveTwoPublicMethods.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.methods;
+
+/**
+ * Tests removing two API methods.
+ */
+public class RemoveTwoPublicMethods {
+	
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/modifiers/AddAbstract.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/modifiers/AddAbstract.java
new file mode 100644
index 0000000000..18043d7226
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/modifiers/AddAbstract.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.modifiers;
+
+/**
+ *
+ */
+public abstract class AddAbstract {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/modifiers/AddAbstractNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/modifiers/AddAbstractNoExtend.java
new file mode 100644
index 0000000000..b2d9e76108
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/modifiers/AddAbstractNoExtend.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.modifiers;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public abstract class AddAbstractNoExtend {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/modifiers/AddAbstractNoExtendNoInstantiate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/modifiers/AddAbstractNoExtendNoInstantiate.java
new file mode 100644
index 0000000000..62b701ee49
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/modifiers/AddAbstractNoExtendNoInstantiate.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.modifiers;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public abstract class AddAbstractNoExtendNoInstantiate {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/modifiers/AddAbstractNoInstantiate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/modifiers/AddAbstractNoInstantiate.java
new file mode 100644
index 0000000000..2b08f88d1e
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/modifiers/AddAbstractNoInstantiate.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.modifiers;
+
+/**
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public abstract class AddAbstractNoInstantiate {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/modifiers/AddFinal.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/modifiers/AddFinal.java
new file mode 100644
index 0000000000..a899256608
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/modifiers/AddFinal.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.modifiers;
+
+/**
+ *
+ */
+public final class AddFinal {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/modifiers/AddFinalNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/modifiers/AddFinalNoExtend.java
new file mode 100644
index 0000000000..ad3a44a783
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/modifiers/AddFinalNoExtend.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.modifiers;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public final class AddFinalNoExtend {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/modifiers/AddFinalNoExtendNoInstantiate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/modifiers/AddFinalNoExtendNoInstantiate.java
new file mode 100644
index 0000000000..a702816094
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/modifiers/AddFinalNoExtendNoInstantiate.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.modifiers;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public final class AddFinalNoExtendNoInstantiate {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/modifiers/AddFinalNoInstantiate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/modifiers/AddFinalNoInstantiate.java
new file mode 100644
index 0000000000..043c068927
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/modifiers/AddFinalNoInstantiate.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.modifiers;
+
+/**
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public final class AddFinalNoInstantiate {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/modifiers/AddFinalRemoveNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/modifiers/AddFinalRemoveNoExtend.java
new file mode 100644
index 0000000000..295ead6adc
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/modifiers/AddFinalRemoveNoExtend.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.modifiers;
+
+/**
+ * 
+ */
+public final class AddFinalRemoveNoExtend {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/modifiers/PublicToPackageVisibility.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/modifiers/PublicToPackageVisibility.java
new file mode 100644
index 0000000000..5f2903c7df
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/modifiers/PublicToPackageVisibility.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.modifiers;
+
+/**
+ *
+ */
+class PublicToPackageVisibility {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/modifiers/RemoveFinal.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/modifiers/RemoveFinal.java
new file mode 100644
index 0000000000..1be96a36a4
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/modifiers/RemoveFinal.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.modifiers;
+
+/**
+ *
+ */
+public class RemoveFinal {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/modifiers/RemoveFinalAddNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/modifiers/RemoveFinalAddNoExtend.java
new file mode 100644
index 0000000000..91be8a33a9
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/modifiers/RemoveFinalAddNoExtend.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.modifiers;
+
+/**
+ * @noextend
+ */
+public class RemoveFinalAddNoExtend {
+
+	public void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/restrictions/AbstractAddNoInstantiate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/restrictions/AbstractAddNoInstantiate.java
new file mode 100644
index 0000000000..d542a39033
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/restrictions/AbstractAddNoInstantiate.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.restrictions;
+
+/**
+ * @noinstantiate
+ */
+public abstract class AbstractAddNoInstantiate {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/restrictions/AbstractRemoveNoInstantiate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/restrictions/AbstractRemoveNoInstantiate.java
new file mode 100644
index 0000000000..a82ae0a072
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/restrictions/AbstractRemoveNoInstantiate.java
@@ -0,0 +1,17 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.restrictions;
+
+/**
+ */
+public abstract class AbstractRemoveNoInstantiate {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/restrictions/AddNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/restrictions/AddNoExtend.java
new file mode 100644
index 0000000000..1163abab53
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/restrictions/AddNoExtend.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.restrictions;
+
+/**
+ * @noextend 
+ */
+public class AddNoExtend {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/restrictions/AddNoInstantiate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/restrictions/AddNoInstantiate.java
new file mode 100644
index 0000000000..0ac6f9b4ee
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/restrictions/AddNoInstantiate.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.restrictions;
+
+/**
+ * @noinstantiate
+ */
+public class AddNoInstantiate {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/restrictions/FinalAddNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/restrictions/FinalAddNoExtend.java
new file mode 100644
index 0000000000..afbff4cd79
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/restrictions/FinalAddNoExtend.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.restrictions;
+
+/**
+ * @noextend
+ */
+public final class FinalAddNoExtend {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/restrictions/FinalRemoveNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/restrictions/FinalRemoveNoExtend.java
new file mode 100644
index 0000000000..ade001a7ed
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/restrictions/FinalRemoveNoExtend.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.restrictions;
+
+/**
+ *
+ */
+public final class FinalRemoveNoExtend {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/restrictions/NoInstantiateAddAbstract.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/restrictions/NoInstantiateAddAbstract.java
new file mode 100644
index 0000000000..6a4ec2aafb
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/restrictions/NoInstantiateAddAbstract.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.restrictions;
+
+/**
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public abstract class NoInstantiateAddAbstract {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/restrictions/RemoveNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/restrictions/RemoveNoExtend.java
new file mode 100644
index 0000000000..71b724d6b5
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/restrictions/RemoveNoExtend.java
@@ -0,0 +1,17 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.restrictions;
+
+/**
+ */
+public class RemoveNoExtend {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/typeparameters/AddClassBound.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/typeparameters/AddClassBound.java
new file mode 100644
index 0000000000..1c98f1835f
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/typeparameters/AddClassBound.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.typeparameters;
+
+/**
+ *
+ */
+public class AddClassBound<E extends Bound> {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/typeparameters/AddFirstTypeParameter.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/typeparameters/AddFirstTypeParameter.java
new file mode 100644
index 0000000000..25d5480ce1
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/typeparameters/AddFirstTypeParameter.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.typeparameters;
+
+/**
+ *
+ */
+public class AddFirstTypeParameter<E> {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/typeparameters/AddInterfaceBound.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/typeparameters/AddInterfaceBound.java
new file mode 100644
index 0000000000..140b9f3bb4
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/typeparameters/AddInterfaceBound.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.typeparameters;
+
+/**
+ *
+ */
+public class AddInterfaceBound<E extends IBound> {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/typeparameters/AddTypeParameter.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/typeparameters/AddTypeParameter.java
new file mode 100644
index 0000000000..2a8657dc39
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/typeparameters/AddTypeParameter.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.typeparameters;
+
+/**
+ *
+ */
+public class AddTypeParameter<E, K> {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/typeparameters/ChangeClassBound.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/typeparameters/ChangeClassBound.java
new file mode 100644
index 0000000000..5dbf826a94
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/typeparameters/ChangeClassBound.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.typeparameters;
+
+/**
+ *
+ */
+public class ChangeClassBound<E extends BoundTwo> {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/typeparameters/ChangeInterfaceBound.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/typeparameters/ChangeInterfaceBound.java
new file mode 100644
index 0000000000..088b29bf0e
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/typeparameters/ChangeInterfaceBound.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.typeparameters;
+
+/**
+ *
+ */
+public class ChangeInterfaceBound<E extends IBoundTwo> {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/typeparameters/ConvertToAnnotation.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/typeparameters/ConvertToAnnotation.java
new file mode 100644
index 0000000000..d994d8d9fb
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/typeparameters/ConvertToAnnotation.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.typeparameters;
+
+/**
+ *
+ */
+public @interface ConvertToAnnotation {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/typeparameters/ConvertToEnum.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/typeparameters/ConvertToEnum.java
new file mode 100644
index 0000000000..66f02889a1
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/typeparameters/ConvertToEnum.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.typeparameters;
+
+/**
+ *
+ */
+public enum ConvertToEnum {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/typeparameters/ConvertToInterface.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/typeparameters/ConvertToInterface.java
new file mode 100644
index 0000000000..4ee9d57747
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/typeparameters/ConvertToInterface.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.typeparameters;
+
+/**
+ *
+ */
+public interface ConvertToInterface {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/typeparameters/RemoveClassBound.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/typeparameters/RemoveClassBound.java
new file mode 100644
index 0000000000..c18313ed43
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/typeparameters/RemoveClassBound.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.typeparameters;
+
+/**
+ *
+ */
+public class RemoveClassBound<E> {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/typeparameters/RemoveInterfaceBound.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/typeparameters/RemoveInterfaceBound.java
new file mode 100644
index 0000000000..b131818e7f
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/typeparameters/RemoveInterfaceBound.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.typeparameters;
+
+/**
+ *
+ */
+public class RemoveInterfaceBound<E> {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/typeparameters/RemoveSecondInterfaceBound.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/typeparameters/RemoveSecondInterfaceBound.java
new file mode 100644
index 0000000000..bd0aca7527
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/typeparameters/RemoveSecondInterfaceBound.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.typeparameters;
+
+/**
+ *
+ */
+public class RemoveSecondInterfaceBound<E extends IBound>{
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/typeparameters/RemoveTypeParameter.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/typeparameters/RemoveTypeParameter.java
new file mode 100644
index 0000000000..970b07eba1
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/class/typeparameters/RemoveTypeParameter.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.classes.typeparameters;
+
+/**
+ *
+ */
+public class RemoveTypeParameter {
+
+	public void add(Object e) {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/constructors/AddTypeParameter.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/constructors/AddTypeParameter.java
new file mode 100644
index 0000000000..b0a4777b5b
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/constructors/AddTypeParameter.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.constructors;
+
+/**
+ *
+ */
+public class AddTypeParameter {
+
+	public <T, U> AddTypeParameter(T t) {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/constructors/ArrayToVarArgs.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/constructors/ArrayToVarArgs.java
new file mode 100644
index 0000000000..09d33c3777
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/constructors/ArrayToVarArgs.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.constructors;
+
+/**
+ *
+ */
+public class ArrayToVarArgs {
+
+	public ArrayToVarArgs(int x, int... args) {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/constructors/ProtectedToPackage.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/constructors/ProtectedToPackage.java
new file mode 100644
index 0000000000..da6e888a5d
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/constructors/ProtectedToPackage.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.constructors;
+
+/**
+ *
+ */
+public class ProtectedToPackage {
+
+	ProtectedToPackage() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/constructors/ProtectedToPackageNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/constructors/ProtectedToPackageNoReference.java
new file mode 100644
index 0000000000..fc751090e3
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/constructors/ProtectedToPackageNoReference.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.constructors;
+
+/**
+ *
+ */
+public class ProtectedToPackageNoReference {
+
+	/**
+	 * @noreference This constructor is not intended to be referenced by clients.
+	 */
+	ProtectedToPackageNoReference() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/constructors/ProtectedToPrivate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/constructors/ProtectedToPrivate.java
new file mode 100644
index 0000000000..03210f600c
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/constructors/ProtectedToPrivate.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.constructors;
+
+/**
+ *
+ */
+public class ProtectedToPrivate {
+
+	private ProtectedToPrivate() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/constructors/ProtectedToPrivateNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/constructors/ProtectedToPrivateNoExtend.java
new file mode 100644
index 0000000000..3c5dd1d21b
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/constructors/ProtectedToPrivateNoExtend.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.constructors;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class ProtectedToPrivateNoExtend {
+
+	private ProtectedToPrivateNoExtend() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/constructors/PublicToPackage.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/constructors/PublicToPackage.java
new file mode 100644
index 0000000000..a78c6baa38
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/constructors/PublicToPackage.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.constructors;
+
+/**
+ *
+ */
+public class PublicToPackage {
+
+	PublicToPackage() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/constructors/PublicToPrivate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/constructors/PublicToPrivate.java
new file mode 100644
index 0000000000..9de70e631f
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/constructors/PublicToPrivate.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.constructors;
+
+/**
+ *
+ */
+public class PublicToPrivate {
+	
+	private PublicToPrivate() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/constructors/PublicToPrivateNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/constructors/PublicToPrivateNoReference.java
new file mode 100644
index 0000000000..9116aa7f21
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/constructors/PublicToPrivateNoReference.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.constructors;
+
+/**
+ *
+ */
+public class PublicToPrivateNoReference {
+	
+	/**
+	 * @noreference This constructor is not intended to be referenced by clients.
+	 */
+	private PublicToPrivateNoReference() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/constructors/PublicToProtected.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/constructors/PublicToProtected.java
new file mode 100644
index 0000000000..f9947b77bf
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/constructors/PublicToProtected.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.constructors;
+
+/**
+ *
+ */
+public class PublicToProtected {
+
+	protected PublicToProtected() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/constructors/RemoveTypeParameter.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/constructors/RemoveTypeParameter.java
new file mode 100644
index 0000000000..6c61bb452f
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/constructors/RemoveTypeParameter.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.constructors;
+
+/**
+ *
+ */
+public class RemoveTypeParameter {
+
+	public <T> RemoveTypeParameter(T t){}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/constructors/VarArgsToArray.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/constructors/VarArgsToArray.java
new file mode 100644
index 0000000000..4c1de61e79
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/constructors/VarArgsToArray.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.constructors;
+
+/**
+ *
+ */
+public class VarArgsToArray {
+
+	public VarArgsToArray(int x, int[] args) {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/enums/RemoveEnumConstant.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/enums/RemoveEnumConstant.java
new file mode 100644
index 0000000000..ad934c981f
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/enums/RemoveEnumConstant.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.enums;
+
+/**
+ *
+ */
+public enum RemoveEnumConstant {
+
+	B , C;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/enums/RemoveField.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/enums/RemoveField.java
new file mode 100644
index 0000000000..db49231ce8
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/enums/RemoveField.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.enums;
+
+/**
+ *
+ */
+public enum RemoveField {
+	
+	A, B, C;
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/enums/RemoveMemberType.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/enums/RemoveMemberType.java
new file mode 100644
index 0000000000..c12dae4a01
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/enums/RemoveMemberType.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.enums;
+
+/**
+ *
+ */
+public enum RemoveMemberType {
+	A, B, C;
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/enums/RemoveMethod.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/enums/RemoveMethod.java
new file mode 100644
index 0000000000..f9c5b49142
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/enums/RemoveMethod.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.enums;
+
+/**
+ *
+ */
+public enum RemoveMethod {
+	A, B, C;
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/enums/RemoveSuperInterface.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/enums/RemoveSuperInterface.java
new file mode 100644
index 0000000000..137be71aed
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/enums/RemoveSuperInterface.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.enums;
+
+/**
+ * 
+ */
+public enum RemoveSuperInterface {
+	A, B, C;
+	public int methodA() {
+		return 0;
+	}
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/enums/ToAnnotation.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/enums/ToAnnotation.java
new file mode 100644
index 0000000000..f350743aff
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/enums/ToAnnotation.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.enums;
+
+/**
+ *
+ */
+public @interface ToAnnotation {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/enums/ToClass.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/enums/ToClass.java
new file mode 100644
index 0000000000..d4fb11caeb
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/enums/ToClass.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.enums;
+
+/**
+ *
+ */
+public class ToClass {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/enums/ToInterface.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/enums/ToInterface.java
new file mode 100644
index 0000000000..9fd5211163
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/enums/ToInterface.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.enums;
+
+/**
+ *
+ */
+public interface ToInterface {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/AddFinal.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/AddFinal.java
new file mode 100644
index 0000000000..840f35d7ab
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/AddFinal.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class AddFinal {
+
+	public final String ADD_FINAL = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/AddFinalNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/AddFinalNoReference.java
new file mode 100644
index 0000000000..8de2f670cb
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/AddFinalNoReference.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class AddFinalNoReference {
+
+	/**
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
+	public final String ADD_FINAL = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/AddFinalOnStatic.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/AddFinalOnStatic.java
new file mode 100644
index 0000000000..da008beb03
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/AddFinalOnStatic.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class AddFinalOnStatic {
+
+	public static final String ADD_FINAL = ""; 
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/AddFinalOnStaticNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/AddFinalOnStaticNoReference.java
new file mode 100644
index 0000000000..e8263747b7
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/AddFinalOnStaticNoReference.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class AddFinalOnStaticNoReference {
+
+	/**
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
+	public static final String ADD_FINAL = ""; 
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/AddNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/AddNoReference.java
new file mode 100644
index 0000000000..f1b77b2537
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/AddNoReference.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class AddNoReference {
+
+	/**
+	 * @noreference
+	 */
+	public String FIELD;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/AddStatic.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/AddStatic.java
new file mode 100644
index 0000000000..407fa3a3ce
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/AddStatic.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class AddStatic {
+	
+	public static String ADD_STATIC;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/AddStaticNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/AddStaticNoReference.java
new file mode 100644
index 0000000000..f5aeae21dd
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/AddStaticNoReference.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class AddStaticNoReference {
+	
+	/**
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
+	public static String ADD_STATIC;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/AddTypeArguments.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/AddTypeArguments.java
new file mode 100644
index 0000000000..fa440552ba
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/AddTypeArguments.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+import java.util.List;
+
+/**
+ *
+ */
+public class AddTypeArguments {
+
+	public List<String> FIELD;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/ChangeType.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/ChangeType.java
new file mode 100644
index 0000000000..7bbdcf902b
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/ChangeType.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class ChangeType {
+
+	public Integer FIELD;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/ChangeTypeNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/ChangeTypeNoExtend.java
new file mode 100644
index 0000000000..440f11fa5b
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/ChangeTypeNoExtend.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class ChangeTypeNoExtend {
+
+	protected Integer FIELD;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/ChangeTypeNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/ChangeTypeNoReference.java
new file mode 100644
index 0000000000..c77e70d9cb
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/ChangeTypeNoReference.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class ChangeTypeNoReference {
+
+	/**
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
+	public Integer FIELD;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/GeneralizeType.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/GeneralizeType.java
new file mode 100644
index 0000000000..e17fcd8ce3
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/GeneralizeType.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class GeneralizeType {
+
+	public Object FIELD;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/GeneralizeTypeNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/GeneralizeTypeNoExtend.java
new file mode 100644
index 0000000000..920d0c6d17
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/GeneralizeTypeNoExtend.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class GeneralizeTypeNoExtend {
+
+	protected Object FIELD;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/GeneralizeTypeNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/GeneralizeTypeNoReference.java
new file mode 100644
index 0000000000..b4c414b310
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/GeneralizeTypeNoReference.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class GeneralizeTypeNoReference {
+
+	/**
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
+	public Object FIELD;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/ModifyValue.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/ModifyValue.java
new file mode 100644
index 0000000000..a8986924ad
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/ModifyValue.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class ModifyValue {
+
+	public static final String CONSTANT = "VALUE_2";
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/ProtectedToPackage.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/ProtectedToPackage.java
new file mode 100644
index 0000000000..f6311521a1
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/ProtectedToPackage.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class ProtectedToPackage {
+
+	String FIELD;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/ProtectedToPackageNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/ProtectedToPackageNoReference.java
new file mode 100644
index 0000000000..d645829daf
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/ProtectedToPackageNoReference.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class ProtectedToPackageNoReference {
+
+	/**
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
+	String FIELD;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/ProtectedToPackageRemoveNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/ProtectedToPackageRemoveNoReference.java
new file mode 100644
index 0000000000..da89761e14
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/ProtectedToPackageRemoveNoReference.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class ProtectedToPackageRemoveNoReference {
+
+	/**
+	 * 
+	 */
+	String FIELD;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/ProtectedToPrivate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/ProtectedToPrivate.java
new file mode 100644
index 0000000000..22d32ff218
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/ProtectedToPrivate.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class ProtectedToPrivate {
+
+	private String FIELD;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/ProtectedToPrivateNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/ProtectedToPrivateNoExtend.java
new file mode 100644
index 0000000000..1d235ba248
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/ProtectedToPrivateNoExtend.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class ProtectedToPrivateNoExtend {
+
+	private String FIELD;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/PublicToPackage.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/PublicToPackage.java
new file mode 100644
index 0000000000..7764a2986b
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/PublicToPackage.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class PublicToPackage {
+
+	String FIELD;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/PublicToPrivate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/PublicToPrivate.java
new file mode 100644
index 0000000000..a108264b15
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/PublicToPrivate.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class PublicToPrivate {
+	
+	private String FIELD;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/PublicToPrivateNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/PublicToPrivateNoReference.java
new file mode 100644
index 0000000000..82807a3527
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/PublicToPrivateNoReference.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class PublicToPrivateNoReference {
+	
+	/**
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
+	private String FIELD;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/PublicToProtected.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/PublicToProtected.java
new file mode 100644
index 0000000000..aa2ca227dd
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/PublicToProtected.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class PublicToProtected {
+
+	protected String FIELD;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/RemoveFinalOnConstant.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/RemoveFinalOnConstant.java
new file mode 100644
index 0000000000..645393d674
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/RemoveFinalOnConstant.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class RemoveFinalOnConstant {
+
+	public static String CONSTANT = "CONSTANT";
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/RemoveStatic.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/RemoveStatic.java
new file mode 100644
index 0000000000..6adabaf738
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/RemoveStatic.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class RemoveStatic {
+
+	public String REMOVE_STATIC;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/RemoveStaticNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/RemoveStaticNoReference.java
new file mode 100644
index 0000000000..84883c42cc
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/RemoveStaticNoReference.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class RemoveStaticNoReference {
+
+	/**
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
+	public String REMOVE_STATIC;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/RemoveTypeArguments.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/RemoveTypeArguments.java
new file mode 100644
index 0000000000..17aec4ef52
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/RemoveTypeArguments.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+import java.util.List;
+
+/**
+ *
+ */
+public class RemoveTypeArguments {
+
+	public List FIELD;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/SpecializeType.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/SpecializeType.java
new file mode 100644
index 0000000000..13d699ef69
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/field/modifiers/SpecializeType.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.fields.modifiers;
+
+/**
+ *
+ */
+public class SpecializeType {
+
+	public String FIELD;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/members/AddField.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/members/AddField.java
new file mode 100644
index 0000000000..a5805b2a71
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/members/AddField.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.members;
+
+/**
+ *
+ */
+public interface AddField {
+
+	public static final String ADDED_FIELD = "ADDED";
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/members/AddFieldNoImplement.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/members/AddFieldNoImplement.java
new file mode 100644
index 0000000000..476fff1092
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/members/AddFieldNoImplement.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.members;
+
+/**
+ * @noimplement This interface is not intended to be implemented by clients.
+ */
+public interface AddFieldNoImplement {
+
+	public static final String ADDED_FIELD = "ADDED";
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/members/AddInterfaceA.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/members/AddInterfaceA.java
new file mode 100644
index 0000000000..c57281a6f8
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/members/AddInterfaceA.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.members;
+
+import a.classes.hierarchy.InterfaceA;
+
+/**
+ *
+ */
+public interface AddInterfaceA extends InterfaceA {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/members/AddInterfaceANoImplement.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/members/AddInterfaceANoImplement.java
new file mode 100644
index 0000000000..aaea7edf69
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/members/AddInterfaceANoImplement.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.members;
+
+import a.classes.hierarchy.InterfaceA;
+
+/**
+ * @noimplement This interface is not intended to be implemented by clients.
+ */
+public interface AddInterfaceANoImplement extends InterfaceA {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/members/AddMemberType.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/members/AddMemberType.java
new file mode 100644
index 0000000000..a4fe17cd18
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/members/AddMemberType.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.members;
+
+/**
+ *
+ */
+public interface AddMemberType {
+
+	public interface MemberType {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/members/AddMemberTypeNoImplement.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/members/AddMemberTypeNoImplement.java
new file mode 100644
index 0000000000..78c9c6d207
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/members/AddMemberTypeNoImplement.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.members;
+
+/**
+ * @noimplement
+ */
+public interface AddMemberTypeNoImplement {
+
+	public interface MemberType {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/members/AddMethod.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/members/AddMethod.java
new file mode 100644
index 0000000000..06fd30f981
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/members/AddMethod.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.members;
+
+/**
+ *
+ */
+public interface AddMethod {
+	
+	public int addMethod(String foo);
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/members/AddMethodNoImplement.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/members/AddMethodNoImplement.java
new file mode 100644
index 0000000000..650b6fb2e4
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/members/AddMethodNoImplement.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.members;
+
+/**
+ * @noimplement This interface is not intended to be implemented by clients.
+ */
+public interface AddMethodNoImplement {
+
+	public int addMethod(String foo);
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/members/ReduceFromABtoA.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/members/ReduceFromABtoA.java
new file mode 100644
index 0000000000..7478a9f6ca
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/members/ReduceFromABtoA.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.members;
+
+import a.classes.hierarchy.InterfaceA;
+
+/**
+ *
+ */
+public interface ReduceFromABtoA extends InterfaceA {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/members/ReduceFromABtoEmpty.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/members/ReduceFromABtoEmpty.java
new file mode 100644
index 0000000000..631640f572
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/members/ReduceFromABtoEmpty.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.members;
+
+/**
+ *
+ */
+public interface ReduceFromABtoEmpty {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/members/RemoveField.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/members/RemoveField.java
new file mode 100644
index 0000000000..237a80e874
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/members/RemoveField.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.members;
+
+/**
+ *
+ */
+public interface RemoveField {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/members/RemoveMemberType.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/members/RemoveMemberType.java
new file mode 100644
index 0000000000..bcf50d556e
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/members/RemoveMemberType.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.members;
+
+/**
+ *
+ */
+public interface RemoveMemberType {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/members/RemoveMethod.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/members/RemoveMethod.java
new file mode 100644
index 0000000000..fec1f57bdf
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/members/RemoveMethod.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.members;
+
+/**
+ *
+ */
+public interface RemoveMethod {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/members/RemoveMethodNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/members/RemoveMethodNoReference.java
new file mode 100644
index 0000000000..212d682095
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/members/RemoveMethodNoReference.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.members;
+
+/**
+ *
+ */
+public interface RemoveMethodNoReference {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/restrictions/AddNoImplement.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/restrictions/AddNoImplement.java
new file mode 100644
index 0000000000..802b337857
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/restrictions/AddNoImplement.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.restrictions;
+
+/**
+ * @noimplement
+ */
+public interface AddNoImplement {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/restrictions/RemoveNoImplement.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/restrictions/RemoveNoImplement.java
new file mode 100644
index 0000000000..defda3fcec
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/restrictions/RemoveNoImplement.java
@@ -0,0 +1,17 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.restrictions;
+
+/**
+ */
+public interface RemoveNoImplement {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/typeparameters/AddClassBound.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/typeparameters/AddClassBound.java
new file mode 100644
index 0000000000..cbd97a1fe9
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/typeparameters/AddClassBound.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.typeparameters;
+
+import a.classes.typeparameters.Bound;
+/**
+ *
+ */
+public interface AddClassBound<E extends Bound> {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/typeparameters/AddFirstTypeParameter.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/typeparameters/AddFirstTypeParameter.java
new file mode 100644
index 0000000000..9202279046
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/typeparameters/AddFirstTypeParameter.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.typeparameters;
+
+/**
+ *
+ */
+public interface AddFirstTypeParameter<E> {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/typeparameters/AddInterfaceBound.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/typeparameters/AddInterfaceBound.java
new file mode 100644
index 0000000000..55b8272dff
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/typeparameters/AddInterfaceBound.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.typeparameters;
+
+import a.classes.typeparameters.IBound;
+/**
+ *
+ */
+public interface AddInterfaceBound<E extends IBound> {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/typeparameters/AddTypeParameter.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/typeparameters/AddTypeParameter.java
new file mode 100644
index 0000000000..e1e5ffd962
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/typeparameters/AddTypeParameter.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.typeparameters;
+
+/**
+ *
+ */
+public interface AddTypeParameter<E, K> {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/typeparameters/ChangeClassBound.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/typeparameters/ChangeClassBound.java
new file mode 100644
index 0000000000..8d0140f954
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/typeparameters/ChangeClassBound.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.typeparameters;
+
+import a.classes.typeparameters.BoundTwo;
+
+/**
+ *
+ */
+public interface ChangeClassBound<E extends BoundTwo> {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/typeparameters/ChangeInterfaceBound.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/typeparameters/ChangeInterfaceBound.java
new file mode 100644
index 0000000000..74cc155419
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/typeparameters/ChangeInterfaceBound.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.typeparameters;
+
+import a.classes.typeparameters.IBoundTwo;
+
+/**
+ *
+ */
+public interface ChangeInterfaceBound<E extends IBoundTwo> {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/typeparameters/RemoveClassBound.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/typeparameters/RemoveClassBound.java
new file mode 100644
index 0000000000..06da867927
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/typeparameters/RemoveClassBound.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.typeparameters;
+
+/**
+ *
+ */
+public interface RemoveClassBound<E> {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/typeparameters/RemoveInterfaceBound.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/typeparameters/RemoveInterfaceBound.java
new file mode 100644
index 0000000000..b2c2e88608
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/typeparameters/RemoveInterfaceBound.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.typeparameters;
+
+/**
+ *
+ */
+public interface RemoveInterfaceBound<E> {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/typeparameters/RemoveSecondInterfaceBound.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/typeparameters/RemoveSecondInterfaceBound.java
new file mode 100644
index 0000000000..68dadf5612
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/typeparameters/RemoveSecondInterfaceBound.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.typeparameters;
+
+import a.classes.typeparameters.IBound;
+
+/**
+ *
+ */
+public interface RemoveSecondInterfaceBound<E extends IBound>{
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/typeparameters/RemoveTypeParameter.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/typeparameters/RemoveTypeParameter.java
new file mode 100644
index 0000000000..80a08044e6
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/interface/typeparameters/RemoveTypeParameter.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.interfaces.typeparameters;
+
+/**
+ *
+ */
+public interface RemoveTypeParameter {
+
+	public void add(Object e);
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/AddAbstract.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/AddAbstract.java
new file mode 100644
index 0000000000..d90be27a0a
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/AddAbstract.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ *
+ */
+public abstract class AddAbstract {
+
+	public abstract void method();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/AddFinal.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/AddFinal.java
new file mode 100644
index 0000000000..313e29ecf9
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/AddFinal.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ *
+ */
+public class AddFinal {
+
+	public final void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/AddFinalNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/AddFinalNoExtend.java
new file mode 100644
index 0000000000..8563cc0ced
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/AddFinalNoExtend.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class AddFinalNoExtend {
+
+	public final void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/AddFinalNoOverride.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/AddFinalNoOverride.java
new file mode 100644
index 0000000000..019b87958f
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/AddFinalNoOverride.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ *
+ */
+public class AddFinalNoOverride {
+
+	/**
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 */
+	public final void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/AddFinalRemoveNoOverride.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/AddFinalRemoveNoOverride.java
new file mode 100644
index 0000000000..1ee076f84d
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/AddFinalRemoveNoOverride.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ *
+ */
+public class AddFinalRemoveNoOverride {
+
+	/**
+	 * 
+	 */
+	public final void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/AddNoOverride.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/AddNoOverride.java
new file mode 100644
index 0000000000..c3303dbd25
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/AddNoOverride.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ *
+ */
+public class AddNoOverride {
+
+	/**
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 */
+	public void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/AddNoOverrideToFinal.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/AddNoOverrideToFinal.java
new file mode 100644
index 0000000000..2aa7099299
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/AddNoOverrideToFinal.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ *
+ */
+public class AddNoOverrideToFinal {
+
+	/**
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 */
+	public final void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/AddNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/AddNoReference.java
new file mode 100644
index 0000000000..b19f99cc6f
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/AddNoReference.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ *
+ */
+public class AddNoReference {
+
+	/**
+	 * @noreference
+	 */
+	public void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/AddStatic.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/AddStatic.java
new file mode 100644
index 0000000000..5aeadcde4e
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/AddStatic.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ *
+ */
+public class AddStatic {
+
+	public static void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/AddStaticNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/AddStaticNoReference.java
new file mode 100644
index 0000000000..ae318e0596
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/AddStaticNoReference.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ *
+ */
+public class AddStaticNoReference {
+
+	/**
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	public static void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/PrivateToPublicNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/PrivateToPublicNoReference.java
new file mode 100644
index 0000000000..7e58742a68
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/PrivateToPublicNoReference.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ *
+ */
+public class PrivateToPublicNoReference {
+	
+	/**
+	 * @noreference 
+	 */
+	public void method(int x) {}
+	
+	void otherMethod() {
+		method(1);
+	}
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/ProtectedToPackage.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/ProtectedToPackage.java
new file mode 100644
index 0000000000..12e2cb69bb
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/ProtectedToPackage.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ *
+ */
+public class ProtectedToPackage {
+
+	void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/ProtectedToPackageNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/ProtectedToPackageNoReference.java
new file mode 100644
index 0000000000..899c988b1e
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/ProtectedToPackageNoReference.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ *
+ */
+public class ProtectedToPackageNoReference {
+
+	/**
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/ProtectedToPrivate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/ProtectedToPrivate.java
new file mode 100644
index 0000000000..51ad3186b9
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/ProtectedToPrivate.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ *
+ */
+public class ProtectedToPrivate {
+
+	private void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/ProtectedToPrivateNoExtend.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/ProtectedToPrivateNoExtend.java
new file mode 100644
index 0000000000..5d4aac5be4
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/ProtectedToPrivateNoExtend.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class ProtectedToPrivateNoExtend {
+
+	private void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/ProtectedToPrivateNoOverride.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/ProtectedToPrivateNoOverride.java
new file mode 100644
index 0000000000..faf073a9b3
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/ProtectedToPrivateNoOverride.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ * 
+ */
+public class ProtectedToPrivateNoOverride {
+
+	/**
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 */
+	private void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/PublicToPackage.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/PublicToPackage.java
new file mode 100644
index 0000000000..aac4b3e397
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/PublicToPackage.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ *
+ */
+public class PublicToPackage {
+
+	void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/PublicToPrivate.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/PublicToPrivate.java
new file mode 100644
index 0000000000..794e9a06b5
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/PublicToPrivate.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ *
+ */
+public class PublicToPrivate {
+	
+	private void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/PublicToPrivateNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/PublicToPrivateNoReference.java
new file mode 100644
index 0000000000..1298638ae3
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/PublicToPrivateNoReference.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ *
+ */
+public class PublicToPrivateNoReference {
+	
+	/**
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	private void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/PublicToProtected.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/PublicToProtected.java
new file mode 100644
index 0000000000..f7988c0f33
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/PublicToProtected.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ *
+ */
+public class PublicToProtected {
+
+	protected void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/RemoveNoOverride.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/RemoveNoOverride.java
new file mode 100644
index 0000000000..1ecf8281b3
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/RemoveNoOverride.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ *
+ */
+public class RemoveNoOverride {
+
+	public void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/RemoveNoOverrideToFinal.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/RemoveNoOverrideToFinal.java
new file mode 100644
index 0000000000..0f362f9bd7
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/RemoveNoOverrideToFinal.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ *
+ */
+public class RemoveNoOverrideToFinal {
+
+	public final void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/RemoveStatic.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/RemoveStatic.java
new file mode 100644
index 0000000000..ef1aee80a2
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/RemoveStatic.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ *
+ */
+public class RemoveStatic {
+
+	public void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/RemoveStaticNoReference.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/RemoveStaticNoReference.java
new file mode 100644
index 0000000000..2da547f024
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/modifiers/RemoveStaticNoReference.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.modifiers;
+
+/**
+ *
+ */
+public class RemoveStaticNoReference {
+
+	/**
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	public void method() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/typeparameters/AddTypeParameter.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/typeparameters/AddTypeParameter.java
new file mode 100644
index 0000000000..1c81007f50
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/typeparameters/AddTypeParameter.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.typeparameters;
+
+/**
+ *
+ */
+public class AddTypeParameter {
+
+	public <T, U> void method(T t) {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/typeparameters/ArrayToVarArgs.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/typeparameters/ArrayToVarArgs.java
new file mode 100644
index 0000000000..b7cbd131e0
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/typeparameters/ArrayToVarArgs.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.typeparameters;
+
+/**
+ *
+ */
+public class ArrayToVarArgs {
+
+	public void method(int x, int... args) {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/typeparameters/RemoveTypeParameter.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/typeparameters/RemoveTypeParameter.java
new file mode 100644
index 0000000000..36d452fd32
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/typeparameters/RemoveTypeParameter.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.typeparameters;
+
+/**
+ *
+ */
+public class RemoveTypeParameter {
+
+	public <T> void method(T t) {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/typeparameters/VarArgsToArray.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/typeparameters/VarArgsToArray.java
new file mode 100644
index 0000000000..c4d567520e
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/methods/typeparameters/VarArgsToArray.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.methods.typeparameters;
+
+/**
+ *
+ */
+public class VarArgsToArray {
+
+	public void method(int x, int[] args) {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/AddField.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/AddField.java
new file mode 100644
index 0000000000..ece783fc0a
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/AddField.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.since;
+
+/**
+ *
+ */
+public class AddField {
+
+	public static final String FIELD = "";
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/AddInheritedMethod.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/AddInheritedMethod.java
new file mode 100644
index 0000000000..5db14ebf1a
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/AddInheritedMethod.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.since;
+
+/**
+ *
+ */
+public class AddInheritedMethod {
+
+	public String toString() {
+		return super.toString();
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/AddMemberType.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/AddMemberType.java
new file mode 100644
index 0000000000..1f968508c6
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/AddMemberType.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.since;
+
+/**
+ *
+ */
+public class AddMemberType {
+
+	public class MemberType {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/AddMethod.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/AddMethod.java
new file mode 100644
index 0000000000..74944f291c
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/AddMethod.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.since;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class AddMethod {
+	
+	public int method() {
+		return -1;
+	}
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/AddNewInterfaceMethod.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/AddNewInterfaceMethod.java
new file mode 100644
index 0000000000..1d16998622
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/AddNewInterfaceMethod.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.since;
+
+import a.classes.hierarchy.InterfaceA;
+/**
+ *
+ */
+public class AddNewInterfaceMethod implements InterfaceA {
+
+	public int methodA() {
+		return 0;
+	}
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/AddNonVisibleMethod.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/AddNonVisibleMethod.java
new file mode 100644
index 0000000000..510c9694d0
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/AddNonVisibleMethod.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.since;
+
+/**
+ *
+ */
+public final class AddNonVisibleMethod {
+
+	protected int method() {
+		return 42;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/AddPrivateField.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/AddPrivateField.java
new file mode 100644
index 0000000000..e60d1fbdff
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/AddPrivateField.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.since;
+
+/**
+ *
+ */
+public class AddPrivateField {
+
+	private String FIELD;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/AddType.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/AddType.java
new file mode 100644
index 0000000000..97dd54a4d5
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/AddType.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.since;
+
+/**
+ *
+ */
+public class AddType {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/InvalidField.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/InvalidField.java
new file mode 100644
index 0000000000..8465130b23
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/InvalidField.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.since;
+
+/**
+ *
+ */
+public class InvalidField {
+
+	/**
+	 * @since 3.0
+	 */
+	public String FIELD;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/InvalidMemberType.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/InvalidMemberType.java
new file mode 100644
index 0000000000..a97afa88e2
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/InvalidMemberType.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.since;
+/**
+ *
+ */
+public class InvalidMemberType {
+
+	/**
+	 * @since 3.0
+	 */
+	public class MemberType {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/InvalidMethod.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/InvalidMethod.java
new file mode 100644
index 0000000000..5c0d695854
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/InvalidMethod.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.since;
+/**
+ *
+ */
+public class InvalidMethod {
+
+	/**
+	 * @since 3.0
+	 */
+	public int method() {
+		return 42;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/InvalidType.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/InvalidType.java
new file mode 100644
index 0000000000..bafcb6cd72
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/InvalidType.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.since;
+
+/**
+ * @since 3.0
+ */
+public class InvalidType {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/MalformedField.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/MalformedField.java
new file mode 100644
index 0000000000..74667cc527
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/MalformedField.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.since;
+
+/**
+ *
+ */
+public class MalformedField {
+
+	/**
+	 * @since 2.0a
+	 */
+	public String FIELD;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/MalformedMemberType.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/MalformedMemberType.java
new file mode 100644
index 0000000000..1a386cb4a2
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/MalformedMemberType.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.since;
+
+/**
+ *
+ */
+public class MalformedMemberType {
+
+	/**
+	 * @since 2.0a
+	 */
+	public class MemberType {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/MalformedMethod.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/MalformedMethod.java
new file mode 100644
index 0000000000..e0916cd30a
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/MalformedMethod.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.since;
+
+/**
+ *
+ */
+public class MalformedMethod {
+
+	/**
+	 * @since 2.0a
+	 */
+	public void method() {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/MalformedTag.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/MalformedTag.java
new file mode 100644
index 0000000000..bc3b88584f
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/MalformedTag.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.since;
+
+/**
+ *
+ */
+public class MalformedTag {
+
+	/**
+	 * @since abc1.0
+	 */
+	public void method(){}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/MalformedType.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/MalformedType.java
new file mode 100644
index 0000000000..8bdbc65f92
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/MalformedType.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.since;
+
+/**
+ * @since 2.0a
+ */
+public class MalformedType {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/ValidSinceTags.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/ValidSinceTags.java
new file mode 100644
index 0000000000..c66c330a67
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/since/ValidSinceTags.java
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.since;
+
+/**
+ *
+ */
+public class ValidSinceTags {
+	/**
+	 * @since a 1.0
+	 */
+	public void m1() {}
+	
+	/**
+	 * @since 1.0 a
+	 */
+	public void m2() {}
+	
+	/**
+	 * @since a 1.0 b
+	 */
+	public void m3() {}	
+	
+	/**
+	 * @since 1.0,a
+	 */
+	public void m4() {}		
+	
+	/**
+	 * @since a,1.0,b
+	 */
+	public void m5() {}	
+	
+	/**
+	 * @since 1.0 , was added in 3.1 as private method
+	 */
+	public void m6() {}
+	
+	/**
+	 * @since 1.0 protected (was added in 2.1 as private class)
+	 */
+	public void m7() {}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/version/AddApi.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/version/AddApi.java
new file mode 100644
index 0000000000..b714ff1f55
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/version/AddApi.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.version;
+
+/**
+ *
+ */
+public class AddApi {
+	
+	public void method(){}
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/version/BreakApi.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/version/BreakApi.java
new file mode 100644
index 0000000000..5d60e6daaf
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/version/BreakApi.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.version;
+
+/**
+ *
+ */
+public class BreakApi {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/version/StableApi.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/version/StableApi.java
new file mode 100644
index 0000000000..dd5d548fad
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/compat/version/StableApi.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.version;
+
+/**
+ * Nothing has changed.... really
+ */
+public class StableApi {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/Iinternal.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/Iinternal.java
new file mode 100644
index 0000000000..b545ab5efb
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/Iinternal.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package internal.x.y.z;
+
+/**
+ * 
+ */
+public interface Iinternal {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/internal.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/internal.java
new file mode 100644
index 0000000000..5dfa35ad3c
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/internal.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package internal.x.y.z;
+
+/**
+ * 
+ */
+public class internal {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test1.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test1.java
new file mode 100644
index 0000000000..e5a8e0365b
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test1.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public class test1 extends internal {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test10.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test10.java
new file mode 100644
index 0000000000..538d6ad9f1
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test10.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+
+/**
+ * 
+ */
+public class test10 {
+	class inner implements Iinternal {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test11.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test11.java
new file mode 100644
index 0000000000..5254e80fe1
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test11.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+
+/**
+ * 
+ */
+public class test11 {
+	static class inner implements Iinternal {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test12.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test12.java
new file mode 100644
index 0000000000..b45f481c41
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test12.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class test12 implements Iinternal {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test13.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test13.java
new file mode 100644
index 0000000000..a3cb033b14
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test13.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+
+/**
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class test13 implements Iinternal {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test14.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test14.java
new file mode 100644
index 0000000000..9db004b65b
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test14.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class test14 implements Iinternal {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test15.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test15.java
new file mode 100644
index 0000000000..eb7322cc23
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test15.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public class test15 {
+
+	public static class inner extends internal {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test16.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test16.java
new file mode 100644
index 0000000000..403d638c6d
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test16.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public class test16 {
+
+	public static class inner extends internal {
+		public static class inner2 extends internal {
+			
+		}
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test17.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test17.java
new file mode 100644
index 0000000000..f4eb3d3087
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test17.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.internal;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class test17 {
+
+	/**
+	 * @noextend This class is not intended to be subclassed by clients.
+	 */
+	public static class inner extends internal {
+		/**
+		 * @noextend This class is not intended to be subclassed by clients.
+		 */
+		public static class inner2 extends internal {
+			
+		}
+	}
+}
+
+class outer extends internal {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test18.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test18.java
new file mode 100644
index 0000000000..ba95f48727
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test18.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.internal;
+
+/**
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class test18 {
+
+	/**
+	 * @noinstantiate This class is not intended to be instantiated by clients.
+	 */
+	public static class inner extends internal {
+		/**
+		 * @noinstantiate This class is not intended to be instantiated by clients.
+		 */
+		public static class inner2 extends internal {
+			
+		}
+	}
+}
+
+class outer extends internal {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test19.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test19.java
new file mode 100644
index 0000000000..0c96ef5394
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test19.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.internal;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class test19 {
+
+	/**
+	 * @noextend This class is not intended to be subclassed by clients.
+	 * @noinstantiate This class is not intended to be instantiated by clients.
+	 */
+	public static class inner extends internal {
+		/**
+		 * @noextend This class is not intended to be subclassed by clients.
+		 * @noinstantiate This class is not intended to be instantiated by clients.
+		 */
+		public static class inner2 extends internal {
+			
+		}
+	}
+}
+
+class outer extends internal {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test2.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test2.java
new file mode 100644
index 0000000000..83973fa12e
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test2.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public class test2 {
+	
+}
+
+class outer extends internal {
+	
+}
\ No newline at end of file
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test20.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test20.java
new file mode 100644
index 0000000000..b4554a3fe2
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test20.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+import internal.x.y.z.internal;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class test20 implements Iinternal {
+
+	/**
+	 * @noextend This class is not intended to be subclassed by clients.
+	 */
+	public static class inner implements Iinternal {
+		/**
+		 * @noextend This class is not intended to be subclassed by clients.
+		 */
+		public static class inner2 implements Iinternal {
+			
+		}
+	}
+}
+
+class outer extends internal {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test21.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test21.java
new file mode 100644
index 0000000000..051449585b
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test21.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+import internal.x.y.z.internal;
+
+/**
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class test21 implements Iinternal {
+
+	/**
+	 * @noinstantiate This class is not intended to be instantiated by clients.
+	 */
+	public static class inner implements Iinternal {
+		/**
+		 * @noinstantiate This class is not intended to be instantiated by clients.
+		 */
+		public static class inner2 implements Iinternal {
+			
+		}
+	}
+}
+
+class outer extends internal {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test22.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test22.java
new file mode 100644
index 0000000000..fe1eae59b6
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test22.java
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+import internal.x.y.z.internal;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class test22 implements Iinternal {
+
+	/**
+	 * @noextend This class is not intended to be subclassed by clients.
+	 * @noinstantiate This class is not intended to be instantiated by clients.
+	 */
+	public static class inner implements Iinternal {
+		/**
+		 * @noextend This class is not intended to be subclassed by clients.
+		 * @noinstantiate This class is not intended to be instantiated by clients.
+		 */
+		public static class inner2 implements Iinternal {
+			
+		}
+	}
+}
+
+class outer extends internal {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test3.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test3.java
new file mode 100644
index 0000000000..00ee98cbde
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test3.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public class test3 {
+
+	class inner extends internal {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test4.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test4.java
new file mode 100644
index 0000000000..75379493f3
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test4.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public class test4 {
+
+	static class inner extends internal {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test5.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test5.java
new file mode 100644
index 0000000000..c8d4b622c2
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test5.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.internal;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+public class test5 extends internal {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test6.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test6.java
new file mode 100644
index 0000000000..75afd65648
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test6.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.internal;
+
+/**
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class test6 extends internal {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test7.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test7.java
new file mode 100644
index 0000000000..670df58416
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test7.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.internal;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class test7 extends internal {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test8.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test8.java
new file mode 100644
index 0000000000..3780310766
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test8.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+
+/**
+ * 
+ */
+public class test8 implements Iinternal {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test9.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test9.java
new file mode 100644
index 0000000000..eccbba8271
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/class/test9.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+
+/**
+ * 
+ */
+public class test9 {
+
+}
+class outer implements Iinternal {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/field/Iinternal.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/field/Iinternal.java
new file mode 100644
index 0000000000..b545ab5efb
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/field/Iinternal.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package internal.x.y.z;
+
+/**
+ * 
+ */
+public interface Iinternal {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/field/internal.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/field/internal.java
new file mode 100644
index 0000000000..5dfa35ad3c
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/field/internal.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package internal.x.y.z;
+
+/**
+ * 
+ */
+public class internal {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/field/testFTL1.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/field/testFTL1.java
new file mode 100644
index 0000000000..36b12c1ea6
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/field/testFTL1.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public class testFTL1 {
+	
+	public internal f1 = null;
+	
+	public Iinternal[] f2 = null;
+	
+	protected internal f3 = null;
+	
+	protected Iinternal[] f4 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/field/testFTL2.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/field/testFTL2.java
new file mode 100644
index 0000000000..7dd1fd4641
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/field/testFTL2.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public class testFTL2 {
+	public internal f1 = null;
+	
+	public Iinternal[] f2 = null;
+	
+	protected internal f3 = null;
+	
+	protected Iinternal f4 = null;
+	
+	public static class inner {
+		public internal f1 = null;
+		
+		public Iinternal[] f2 = null;
+		
+		protected internal f3 = null;
+		
+		protected Iinternal f4 = null;
+	}
+	
+}
\ No newline at end of file
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/field/testFTL3.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/field/testFTL3.java
new file mode 100644
index 0000000000..860738fb92
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/field/testFTL3.java
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public class testFTL3 {
+	/**
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
+	public internal f1 = null;
+	
+	/**
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
+	public Iinternal[] f2 = null;
+	
+	/**
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
+	protected internal f3 = null;
+	
+	/**
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
+	protected Iinternal f4 = null;
+	
+	public static class inner {
+		/**
+		 * @noreference This field is not intended to be referenced by clients.
+		 */
+		public internal f1 = null;
+		
+		/**
+		 * @noreference This field is not intended to be referenced by clients.
+		 */
+		public Iinternal[] f2 = null;
+		
+		/**
+		 * @noreference This field is not intended to be referenced by clients.
+		 */
+		protected internal f3 = null;
+		
+		/**
+		 * @noreference This field is not intended to be referenced by clients.
+		 */
+		protected Iinternal f4 = null;
+	}
+	
+}
\ No newline at end of file
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/field/testFTL4.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/field/testFTL4.java
new file mode 100644
index 0000000000..c7f4a3fd49
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/field/testFTL4.java
@@ -0,0 +1,54 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public class testFTL4 {
+	/**
+	 */
+	public static internal f1 = null;
+	
+	/**
+	 */
+	public final Iinternal[] f2 = null;
+	
+	/**
+	 */
+	protected internal f3 = null;
+	
+	/**
+	 */
+	protected final Iinternal f4 = null;
+	
+	public static class inner {
+		/**
+		 */
+		public internal f1 = null;
+		
+		/**
+		 */
+		public final Iinternal[] f2 = null;
+		
+		/**
+		 */
+		protected internal f3 = null;
+		
+		/**
+		 */
+		protected final Iinternal f4 = null;
+	}
+	
+}
\ No newline at end of file
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/field/testFTL5.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/field/testFTL5.java
new file mode 100644
index 0000000000..e0321dd5a6
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/field/testFTL5.java
@@ -0,0 +1,58 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public class testFTL5 {
+	/**
+	 */
+	public static internal f1 = null;
+	
+	/**
+	 * @noreference
+	 */
+	public final Iinternal[] f2 = null;
+	
+	/**
+	 */
+	protected internal f3 = null;
+	
+	/**
+	 * @noreference
+	 */
+	protected final Iinternal f4 = null;
+	
+	public static class inner {
+		/**
+		 */
+		public internal f1 = null;
+		
+		/**
+		 * @noreference
+		 */
+		public final Iinternal[] f2 = null;
+		
+		/**
+		 */
+		protected internal f3 = null;
+		
+		/**
+		 * @noreference
+		 */
+		protected final Iinternal f4 = null;
+	}
+	
+}
\ No newline at end of file
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/interface/Etest1.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/interface/Etest1.java
new file mode 100644
index 0000000000..ddb2e6a9a7
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/interface/Etest1.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+
+/**
+ * 
+ */
+public interface Etest1 extends Iinternal {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/interface/Etest2.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/interface/Etest2.java
new file mode 100644
index 0000000000..e6590192c6
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/interface/Etest2.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+
+/**
+ * 
+ */
+public interface Etest2 {
+
+}
+
+interface outer extends Iinternal {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/interface/Etest3.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/interface/Etest3.java
new file mode 100644
index 0000000000..1aa7ec92a8
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/interface/Etest3.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+
+/**
+ * 
+ */
+public interface Etest3 {
+	interface inner extends Iinternal {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/interface/Etest4.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/interface/Etest4.java
new file mode 100644
index 0000000000..8a0cffc1d3
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/interface/Etest4.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+
+/**
+ * 
+ */
+public interface Etest4 {
+	static interface inner extends Iinternal {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/interface/Etest5.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/interface/Etest5.java
new file mode 100644
index 0000000000..4f1afbcdb0
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/interface/Etest5.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+
+/**
+ * 
+ */
+public interface Etest5 {
+
+}
+
+interface outer {
+	interface inner extends Iinternal {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/interface/Etest6.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/interface/Etest6.java
new file mode 100644
index 0000000000..2ba955e36c
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/interface/Etest6.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+
+/**
+ * @noimplement This interface is not intended to be implemented by clients.
+ */
+public interface Etest6 extends Iinternal {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/interface/Etest7.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/interface/Etest7.java
new file mode 100644
index 0000000000..15358ffde9
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/interface/Etest7.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+
+/**
+ * 
+ */
+public interface Etest7 {
+interface inner {
+	interface inner2 extends Iinternal {
+		
+	}
+}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/interface/Etest8.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/interface/Etest8.java
new file mode 100644
index 0000000000..b919f1c38d
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/interface/Etest8.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+
+/**
+ * 
+ */
+public interface Etest8 extends Iinternal {
+	interface inner {
+		
+	}
+	interface inner2 {
+		interface inner extends Iinternal {
+			
+		}
+	}
+	interface inner3 extends Iinternal {
+		
+	}
+}
+
+interface outer {
+	interface inner extends Iinternal {
+		
+	}
+}
+
+interface outer2 {
+	interface inner {
+		interface inner2 extends Iinternal {
+			
+		}
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/interface/Etest9.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/interface/Etest9.java
new file mode 100644
index 0000000000..ce17569fef
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/interface/Etest9.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+
+/**
+ * @noimplement This interface is not intended to be implemented by clients.
+ */
+public interface Etest9 extends Iinternal {
+/**
+ * @noimplement This interface is not intended to be implemented by clients.
+ */
+interface inner extends Iinternal {
+	/**
+	 * @noimplement This interface is not intended to be implemented by clients.
+	 */
+	interface inner2 extends Iinternal {
+		
+	}
+}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/interface/Iinternal.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/interface/Iinternal.java
new file mode 100644
index 0000000000..b545ab5efb
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/interface/Iinternal.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package internal.x.y.z;
+
+/**
+ * 
+ */
+public interface Iinternal {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/Iinternal.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/Iinternal.java
new file mode 100644
index 0000000000..b545ab5efb
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/Iinternal.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package internal.x.y.z;
+
+/**
+ * 
+ */
+public interface Iinternal {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/internal.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/internal.java
new file mode 100644
index 0000000000..5dfa35ad3c
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/internal.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package internal.x.y.z;
+
+/**
+ * 
+ */
+public class internal {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testCPL1.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testCPL1.java
new file mode 100644
index 0000000000..e2ed71910e
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testCPL1.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public class testCPL1 {
+
+	public testCPL1(internal i) {
+		
+	}
+	
+	protected testCPL1(internal i, Object o) {
+		
+	}
+	
+	public testCPL1(String s, internal i, int n) {
+		
+	}
+	
+	protected testCPL1(String s, internal i, int n, double d) {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testCPL10.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testCPL10.java
new file mode 100644
index 0000000000..6d0966f39c
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testCPL10.java
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public class testCPL10 {
+	public static class inner {
+		public static class inner2 {
+			private inner2(internal i, Iinternal ii) {
+				
+			}
+			
+			private inner2(internal i, Object o, Iinternal ii) {
+				
+			}
+		}
+	}
+	
+	public static class inner3 {
+		private inner3(String s, internal i, int n, Iinternal ii) {
+			
+		}
+		
+		private inner3(String s, internal i, int n, double d, Iinternal ii) {
+			
+		}
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testCPL11.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testCPL11.java
new file mode 100644
index 0000000000..083bd37a31
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testCPL11.java
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public class testCPL11 {
+	public static class inner {
+		public static class inner2 {
+			/**
+			 * Constructor
+			 * @param i
+			 * @param ii
+			 * @noreference This constructor is not intended to be referenced by clients.
+			 */
+			public inner2(internal i, Iinternal ii) {
+				
+			}
+			
+			/**
+			 * Constructor
+			 * @param i
+			 * @param o
+			 * @param ii
+			 */
+			public inner2(internal i, internal i2, Iinternal ii) {
+				
+			}
+		}
+	}
+	
+	public static class inner3 {
+		/**
+		 * Constructor
+		 * @param s
+		 * @param i
+		 * @param n
+		 * @param ii
+		 * @noreference This constructor is not intended to be referenced by clients.
+		 */
+		public inner3(String s, internal i, int n, Iinternal ii) {
+			
+		}
+		
+		public inner3(String s, internal i, int n, internal i2, Iinternal ii) {
+			
+		}
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testCPL12.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testCPL12.java
new file mode 100644
index 0000000000..2fe5952f9f
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testCPL12.java
@@ -0,0 +1,69 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public class testCPL12 {
+	public static class inner {
+		public static class inner2 {
+			/**
+			 * Constructor
+			 * @param i
+			 * @param ii
+			 */
+			public inner2(internal i, Iinternal ii) {
+				
+			}
+			
+			/**
+			 * Constructor
+			 * @param i
+			 * @param o
+			 * @param ii
+			 * @noreference This constructor is not intended to be referenced by clients.
+			 */
+			public inner2(internal i, internal i2, Iinternal ii) {
+				
+			}
+		}
+	}
+	
+	public static class inner3 {
+		/**
+		 * Constructor
+		 * @param s
+		 * @param i
+		 * @param n
+		 * @param ii
+		 */
+		public inner3(String s, internal i, int n, Iinternal ii) {
+			
+		}
+		
+		/**
+		 * Constructor
+		 * @param s
+		 * @param i
+		 * @param n
+		 * @param i2
+		 * @param ii
+		 * @noreference This constructor is not intended to be referenced by clients.
+		 */
+		public inner3(String s, internal i, int n, internal i2, Iinternal ii) {
+			
+		}
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testCPL13.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testCPL13.java
new file mode 100644
index 0000000000..cd56174246
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testCPL13.java
@@ -0,0 +1,71 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public class testCPL13 {
+	public static class inner {
+		public static class inner2 {
+			/**
+			 * Constructor
+			 * @param i
+			 * @param ii
+			 * @noreference This constructor is not intended to be referenced by clients.
+			 */
+			public inner2(internal i, Iinternal ii) {
+				
+			}
+			
+			/**
+			 * Constructor
+			 * @param i
+			 * @param o
+			 * @param ii
+			 * @noreference This constructor is not intended to be referenced by clients.
+			 */
+			public inner2(internal i, internal i2, Iinternal ii) {
+				
+			}
+		}
+	}
+	
+	public static class inner3 {
+		/**
+		 * Constructor
+		 * @param s
+		 * @param i
+		 * @param n
+		 * @param ii
+		 * @noreference This constructor is not intended to be referenced by clients.
+		 */
+		public inner3(String s, internal i, int n, Iinternal ii) {
+			
+		}
+		
+		/**
+		 * Constructor
+		 * @param s
+		 * @param i
+		 * @param n
+		 * @param i2
+		 * @param ii
+		 * @noreference This constructor is not intended to be referenced by clients.
+		 */
+		public inner3(String s, internal i, int n, internal i2, Iinternal ii) {
+			
+		}
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testCPL2.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testCPL2.java
new file mode 100644
index 0000000000..7e22f44352
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testCPL2.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public class testCPL2 {
+
+	private testCPL2(internal i) {
+		
+	}
+	
+	private testCPL2(internal i, Object o) {
+		
+	}
+	
+	private testCPL2(String s, internal i, int n) {
+		
+	}
+	
+	private testCPL2(String s, internal i, int n, double d) {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testCPL3.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testCPL3.java
new file mode 100644
index 0000000000..8ec6fb0f2b
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testCPL3.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+
+/**
+ * 
+ */
+public class testCPL3 {
+
+	public testCPL3(Iinternal i) {
+		
+	}
+	
+	protected testCPL3(Iinternal i, Object o) {
+		
+	}
+	
+	public testCPL3(String s, Iinternal i, int n) {
+		
+	}
+	
+	protected testCPL3(String s, Iinternal i, int n, double d) {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testCPL4.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testCPL4.java
new file mode 100644
index 0000000000..500c8475b4
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testCPL4.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public class testCPL4 {
+
+	private testCPL4(internal i) {
+		
+	}
+	
+	private testCPL4(internal i, Object o) {
+		
+	}
+	
+	private testCPL4(String s, internal i, int n) {
+		
+	}
+	
+	private testCPL4(String s, internal i, int n, double d) {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testCPL5.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testCPL5.java
new file mode 100644
index 0000000000..6ef8c71ca0
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testCPL5.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public class testCPL5 {
+
+	public testCPL5(internal i, Iinternal ii) {
+		
+	}
+	
+	protected testCPL5(internal i, Object o, Iinternal ii) {
+		
+	}
+	
+	public testCPL5(String s, internal i, int n, Iinternal ii) {
+		
+	}
+	
+	protected testCPL5(String s, internal i, int n, double d, Iinternal ii) {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testCPL6.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testCPL6.java
new file mode 100644
index 0000000000..ead03bcbf1
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testCPL6.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public class testCPL6 {
+
+	private testCPL6(internal i, Iinternal ii) {
+		
+	}
+	
+	private testCPL6(internal i, Object o, Iinternal ii) {
+		
+	}
+	
+	private testCPL6(String s, internal i, int n, Iinternal ii) {
+		
+	}
+	
+	private testCPL6(String s, internal i, int n, double d, Iinternal ii) {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testCPL7.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testCPL7.java
new file mode 100644
index 0000000000..8485d5e71d
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testCPL7.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public class testCPL7 {
+
+	public static class inner {
+		public inner(internal i, Iinternal ii) {
+			
+		}
+		
+		protected inner(internal i, Object o, Iinternal ii) {
+			
+		}
+		
+		public inner(String s, internal i, int n, Iinternal ii) {
+			
+		}
+		
+		protected inner(String s, internal i, int n, double d, Iinternal ii) {
+			
+		}
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testCPL8.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testCPL8.java
new file mode 100644
index 0000000000..2431ce2400
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testCPL8.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public class testCPL8 {
+
+	public static class inner {
+		private inner(internal i, Iinternal ii) {
+			
+		}
+		
+		private inner(internal i, Object o, Iinternal ii) {
+			
+		}
+		
+		private inner(String s, internal i, int n, Iinternal ii) {
+			
+		}
+		
+		private inner(String s, internal i, int n, double d, Iinternal ii) {
+			
+		}
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testCPL9.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testCPL9.java
new file mode 100644
index 0000000000..1194d2acab
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testCPL9.java
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public class testCPL9 {
+	public static class inner {
+		public static class inner2 {
+			public inner2(internal i, Iinternal ii) {
+				
+			}
+			
+			protected inner2(internal i, Object o, Iinternal ii) {
+				
+			}
+		}
+	}
+	
+	public static class inner3 {
+		public inner3(String s, internal i, int n, Iinternal ii) {
+			
+		}
+		
+		protected inner3(String s, internal i, int n, double d, Iinternal ii) {
+			
+		}
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMPL1.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMPL1.java
new file mode 100644
index 0000000000..79ea048087
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMPL1.java
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public class testMPL1 {
+
+	public void m1(internal i) {
+		
+	}
+	
+	public Object m2(internal i) {
+		return null;
+	}
+	
+	public char[] m3(internal i) {
+		return new char[0];
+	}
+	
+	protected void m4(internal i) {
+		
+	}
+	
+	protected Object m5(internal i) {
+		return null;
+	}
+	
+	protected char[] m6(internal i) {
+		return new char[0];	
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMPL10.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMPL10.java
new file mode 100644
index 0000000000..412fc4efaa
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMPL10.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public class testMPL10 {
+	public static class inner {
+		public static class inner2 {
+			private void m1(Iinternal i, Object o, double d, internal ii) {
+				
+			}
+			
+			private Object m2(Iinternal i, Object o, double d, internal ii) {
+				return null;
+			}
+			
+			private char[] m3(Iinternal i, Object o, double d, internal ii) {
+				return new char[0];
+			}
+		}
+	}
+	
+	public static class inner3 {
+		private void m4(Iinternal i, Object o, double d, internal ii) {
+			
+		}
+		
+		private Object m5(Iinternal i, Object o, double d, internal ii) {
+			return null;
+		}
+		
+		private char[] m6(Iinternal i, Object o, double d, internal ii) {
+			return new char[0];	
+		}
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMPL11.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMPL11.java
new file mode 100644
index 0000000000..62f77750ab
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMPL11.java
@@ -0,0 +1,92 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public class testMPL11 {
+
+	/**
+	 * @param i
+	 * @param o
+	 * @param d
+	 * @param ii
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 */
+	public void m1(Iinternal i, Object o, double d, internal ii) {
+		
+	}
+	
+	/**
+	 * @param i
+	 * @param o
+	 * @param d
+	 * @param ii
+	 * @return
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 */
+	public Object m2(Iinternal i, Object o, double d, internal ii) {
+		return null;
+	}
+	
+	/**
+	 * @param i
+	 * @param o
+	 * @param d
+	 * @param ii
+	 * @return
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 */
+	public char[] m3(Iinternal i, Object o, double d, internal ii) {
+		return new char[0];
+	}
+	
+	public static class inner {
+		/**
+		 * @param i
+		 * @param o
+		 * @param d
+		 * @param ii
+		 * @nooverride This method is not intended to be re-implemented or extended by clients.
+		 */
+		protected void m1(Iinternal i, Object o, double d, internal ii) {
+			
+		}
+		
+		/**
+		 * @param i
+		 * @param o
+		 * @param d
+		 * @param ii
+		 * @return
+		 * @nooverride This method is not intended to be re-implemented or extended by clients.
+		 */
+		protected Object m2(Iinternal i, Object o, double d, internal ii) {
+			return null;
+		}
+		
+		/**
+		 * @param i
+		 * @param o
+		 * @param d
+		 * @param ii
+		 * @return
+		 * @nooverride This method is not intended to be re-implemented or extended by clients.
+		 */
+		protected char[] m3(Iinternal i, Object o, double d, internal ii) {
+			return new char[0];	
+		}
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMPL12.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMPL12.java
new file mode 100644
index 0000000000..ce6df6d8fe
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMPL12.java
@@ -0,0 +1,92 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public class testMPL12 {
+
+	/**
+	 * @param i
+	 * @param o
+	 * @param d
+	 * @param ii
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	public void m1(Iinternal i, Object o, double d, internal ii) {
+		
+	}
+	
+	/**
+	 * @param i
+	 * @param o
+	 * @param d
+	 * @param ii
+	 * @return
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	public Object m2(Iinternal i, Object o, double d, internal ii) {
+		return null;
+	}
+	
+	/**
+	 * @param i
+	 * @param o
+	 * @param d
+	 * @param ii
+	 * @return
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	public char[] m3(Iinternal i, Object o, double d, internal ii) {
+		return new char[0];
+	}
+	
+	public static class inner {
+		/**
+		 * @param i
+		 * @param o
+		 * @param d
+		 * @param ii
+		 * @noreference This method is not intended to be referenced by clients.
+		 */
+		protected void m1(Iinternal i, Object o, double d, internal ii) {
+			
+		}
+		
+		/**
+		 * @param i
+		 * @param o
+		 * @param d
+		 * @param ii
+		 * @return
+		 * @noreference This method is not intended to be referenced by clients.
+		 */
+		protected Object m2(Iinternal i, Object o, double d, internal ii) {
+			return null;
+		}
+		
+		/**
+		 * @param i
+		 * @param o
+		 * @param d
+		 * @param ii
+		 * @return
+		 * @noreference This method is not intended to be referenced by clients.
+		 */
+		protected char[] m3(Iinternal i, Object o, double d, internal ii) {
+			return new char[0];	
+		}
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMPL13.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMPL13.java
new file mode 100644
index 0000000000..a99bbda1a3
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMPL13.java
@@ -0,0 +1,98 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public class testMPL13 {
+
+	/**
+	 * @param i
+	 * @param o
+	 * @param d
+	 * @param ii
+	 * @noreference This method is not intended to be referenced by clients.
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 */
+	public void m1(Iinternal i, Object o, double d, internal ii) {
+		
+	}
+	
+	/**
+	 * @param i
+	 * @param o
+	 * @param d
+	 * @param ii
+	 * @return
+	 * @noreference This method is not intended to be referenced by clients.
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 */
+	public Object m2(Iinternal i, Object o, double d, internal ii) {
+		return null;
+	}
+	
+	/**
+	 * @param i
+	 * @param o
+	 * @param d
+	 * @param ii
+	 * @return
+	 * @noreference This method is not intended to be referenced by clients.
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 */
+	public char[] m3(Iinternal i, Object o, double d, internal ii) {
+		return new char[0];
+	}
+	
+	public static class inner {
+		/**
+		 * @param i
+		 * @param o
+		 * @param d
+		 * @param ii
+		 * @noreference This method is not intended to be referenced by clients.
+		 * @nooverride This method is not intended to be re-implemented or extended by clients.
+		 */
+		protected void m4(Iinternal i, Object o, double d, internal ii) {
+			
+		}
+		
+		/**
+		 * @param i
+		 * @param o
+		 * @param d
+		 * @param ii
+		 * @return
+		 * @noreference This method is not intended to be referenced by clients.
+		 * @nooverride This method is not intended to be re-implemented or extended by clients.
+		 */
+		protected Object m5(Iinternal i, Object o, double d, internal ii) {
+			return null;
+		}
+		
+		/**
+		 * @param i
+		 * @param o
+		 * @param d
+		 * @param ii
+		 * @return
+		 * @noreference This method is not intended to be referenced by clients.
+		 * @nooverride This method is not intended to be re-implemented or extended by clients.
+		 */
+		protected char[] m6(Iinternal i, Object o, double d, internal ii) {
+			return new char[0];	
+		}
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMPL2.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMPL2.java
new file mode 100644
index 0000000000..4b5d765cba
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMPL2.java
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public class testMPL2 {
+
+	private void m1(internal i) {
+		
+	}
+	
+	private Object m2(internal i) {
+		return null;
+	}
+	
+	private char[] m3(internal i) {
+		return new char[0];
+	}
+	
+	private void m4(internal i) {
+		
+	}
+	
+	private Object m5(internal i) {
+		return null;
+	}
+	
+	private char[] m6(internal i) {
+		return new char[0];	
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMPL3.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMPL3.java
new file mode 100644
index 0000000000..fd3df955aa
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMPL3.java
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+
+/**
+ * 
+ */
+public class testMPL3 {
+
+	public void m1(Iinternal i) {
+		
+	}
+	
+	public Object m2(Iinternal i) {
+		return null;
+	}
+	
+	public char[] m3(Iinternal i) {
+		return new char[0];
+	}
+	
+	protected void m4(Iinternal i) {
+		
+	}
+	
+	protected Object m5(Iinternal i) {
+		return null;
+	}
+	
+	protected char[] m6(Iinternal i) {
+		return new char[0];	
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMPL4.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMPL4.java
new file mode 100644
index 0000000000..5eb98791ff
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMPL4.java
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+
+/**
+ * 
+ */
+public class testMPL4 {
+
+	private void m1(Iinternal i) {
+		
+	}
+	
+	private Object m2(Iinternal i) {
+		return null;
+	}
+	
+	private char[] m3(Iinternal i) {
+		return new char[0];
+	}
+	
+	private void m4(Iinternal i) {
+		
+	}
+	
+	private Object m5(Iinternal i) {
+		return null;
+	}
+	
+	private char[] m6(Iinternal i) {
+		return new char[0];	
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMPL5.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMPL5.java
new file mode 100644
index 0000000000..2a380f0038
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMPL5.java
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public class testMPL5 {
+	public void m1(Iinternal i, Object o, double d, internal ii) {
+		
+	}
+	
+	public Object m2(Iinternal i, Object o, double d, internal ii) {
+		return null;
+	}
+	
+	public char[] m3(Iinternal i, Object o, double d, internal ii) {
+		return new char[0];
+	}
+	
+	protected void m4(Iinternal i, Object o, double d, internal ii) {
+		
+	}
+	
+	protected Object m5(Iinternal i, Object o, double d, internal ii) {
+		return null;
+	}
+	
+	protected char[] m6(Iinternal i, Object o, double d, internal ii) {
+		return new char[0];	
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMPL6.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMPL6.java
new file mode 100644
index 0000000000..79e4b8aef0
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMPL6.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public class testMPL6 {
+
+	private void m1(Iinternal i, Object o, double d, internal ii) {
+		
+	}
+	
+	private Object m2(Iinternal i, Object o, double d, internal ii) {
+		return null;
+	}
+	
+	private char[] m3(Iinternal i, Object o, double d, internal ii) {
+		return new char[0];
+	}
+	
+	private void m4(Iinternal i, Object o, double d, internal ii) {
+		
+	}
+	
+	private Object m5(Iinternal i, Object o, double d, internal ii) {
+		return null;
+	}
+	
+	private char[] m6(Iinternal i, Object o, double d, internal ii) {
+		return new char[0];	
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMPL7.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMPL7.java
new file mode 100644
index 0000000000..54ded76f0b
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMPL7.java
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public class testMPL7 {
+
+	public static class inner {
+		public void m1(Iinternal i, Object o, double d, internal ii) {
+			
+		}
+		
+		public Object m2(Iinternal i, Object o, double d, internal ii) {
+			return null;
+		}
+		
+		public char[] m3(Iinternal i, Object o, double d, internal ii) {
+			return new char[0];
+		}
+		
+		protected void m4(Iinternal i, Object o, double d, internal ii) {
+			
+		}
+		
+		protected Object m5(Iinternal i, Object o, double d, internal ii) {
+			return null;
+		}
+		
+		protected char[] m6(Iinternal i, Object o, double d, internal ii) {
+			return new char[0];	
+		}
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMPL8.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMPL8.java
new file mode 100644
index 0000000000..950979f67b
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMPL8.java
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public class testMPL8 {
+
+	public static class inner {
+		private void m1(Iinternal i, Object o, double d, internal ii) {
+			
+		}
+		
+		private Object m2(Iinternal i, Object o, double d, internal ii) {
+			return null;
+		}
+		
+		private char[] m3(Iinternal i, Object o, double d, internal ii) {
+			return new char[0];
+		}
+		
+		private void m4(Iinternal i, Object o, double d, internal ii) {
+			
+		}
+		
+		private Object m5(Iinternal i, Object o, double d, internal ii) {
+			return null;
+		}
+		
+		private char[] m6(Iinternal i, Object o, double d, internal ii) {
+			return new char[0];	
+		}
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMPL9.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMPL9.java
new file mode 100644
index 0000000000..313dd2d99f
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMPL9.java
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public class testMPL9 {
+
+	public static class inner {
+		public static class inner2 {
+			public void m1(Iinternal i, Object o, double d, internal ii) {
+				
+			}
+			
+			public Object m2(Iinternal i, Object o, double d, internal ii) {
+				return null;
+			}
+			
+			public char[] m3(Iinternal i, Object o, double d, internal ii) {
+				return new char[0];
+			}
+		}
+	}
+	
+	public static class inner3 {
+		protected void m4(Iinternal i, Object o, double d, internal ii) {
+			
+		}
+		
+		protected Object m5(Iinternal i, Object o, double d, internal ii) {
+			return null;
+		}
+		
+		protected char[] m6(Iinternal i, Object o, double d, internal ii) {
+			return new char[0];	
+		}
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMRL1.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMRL1.java
new file mode 100644
index 0000000000..79ceeb640c
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMRL1.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public class testMRL1 {
+
+	public internal m1() {
+		return null;
+	}
+	
+	protected internal m2() {
+		return null;
+	}
+	
+	public Iinternal m3() {
+		return null;
+	}
+	
+	protected Iinternal m4() {
+		return null;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMRL10.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMRL10.java
new file mode 100644
index 0000000000..46071f45b9
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMRL10.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public final class testMRL10 {
+	private final internal m1() {
+		return null;
+	}
+	
+	private final internal m2() {
+		return null;
+	}
+	
+	private Iinternal m3() {
+		return null;
+	}
+	
+	private Iinternal m4() {
+		return null;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMRL11.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMRL11.java
new file mode 100644
index 0000000000..a13ff8bc3a
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMRL11.java
@@ -0,0 +1,87 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public class testMRL11 {
+
+	/**
+	 * @return
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 */
+	public internal m1() {
+		return null;
+	}
+	
+	/**
+	 * @return
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 */
+	protected internal m2() {
+		return null;
+	}
+	
+	/**
+	 * @return
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 */
+	public Iinternal m3() {
+		return null;
+	}
+	
+	/**
+	 * @return
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 */
+	protected Iinternal m4() {
+		return null;
+	}
+	
+	public static class inner {
+		/**
+		 * @return
+		 * @nooverride This method is not intended to be re-implemented or extended by clients.
+		 */
+		public internal m1() {
+			return null;
+		}
+		
+		/**
+		 * @return
+		 * @nooverride This method is not intended to be re-implemented or extended by clients.
+		 */
+		protected internal m2() {
+			return null;
+		}
+		
+		/**
+		 * @return
+		 * @nooverride This method is not intended to be re-implemented or extended by clients.
+		 */
+		public Iinternal m3() {
+			return null;
+		}
+		
+		/**
+		 * @return
+
+		 * @nooverride This method is not intended to be re-implemented or extended by clients.
+		 */
+		protected Iinternal m4() {
+			return null;
+		}
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMRL12.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMRL12.java
new file mode 100644
index 0000000000..d4b84bcdec
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMRL12.java
@@ -0,0 +1,86 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public class testMRL12 {
+
+	/**
+	 * @return
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	public internal m1() {
+		return null;
+	}
+	
+	/**
+	 * @return
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	protected internal m2() {
+		return null;
+	}
+	
+	/**
+	 * @return
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	public Iinternal m3() {
+		return null;
+	}
+	
+	/**
+	 * @return
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	protected Iinternal m4() {
+		return null;
+	}
+	
+	public static class inner {
+		/**
+		 * @return
+		 * @noreference This method is not intended to be referenced by clients.
+		 */
+		public internal m1() {
+			return null;
+		}
+		
+		/**
+		 * @return
+		 * @noreference This method is not intended to be referenced by clients.
+		 */
+		protected internal m2() {
+			return null;
+		}
+		
+		/**
+		 * @return
+		 * @noreference This method is not intended to be referenced by clients.
+		 */
+		public Iinternal m3() {
+			return null;
+		}
+		
+		/**
+		 * @return
+		 * @noreference This method is not intended to be referenced by clients.
+		 */
+		protected Iinternal m4() {
+			return null;
+		}
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMRL13.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMRL13.java
new file mode 100644
index 0000000000..3335da086c
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMRL13.java
@@ -0,0 +1,94 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public class testMRL13 {
+
+	/**
+	 * @return
+	 * @noreference This method is not intended to be referenced by clients.
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 */
+	public internal m1() {
+		return null;
+	}
+	
+	/**
+	 * @return
+	 * @noreference This method is not intended to be referenced by clients.
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 */
+	protected internal m2() {
+		return null;
+	}
+	
+	/**
+	 * @return
+	 * @noreference This method is not intended to be referenced by clients.
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 */
+	public Iinternal m3() {
+		return null;
+	}
+	
+	/**
+	 * @return
+	 * @noreference This method is not intended to be referenced by clients.
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 */
+	protected Iinternal m4() {
+		return null;
+	}
+	
+	public static class inner {
+		/**
+		 * @return
+		 * @noreference This method is not intended to be referenced by clients.
+		 * @nooverride This method is not intended to be re-implemented or extended by clients.
+		 */
+		public internal m1() {
+			return null;
+		}
+		
+		/**
+		 * @return
+		 * @noreference This method is not intended to be referenced by clients.
+		 * @nooverride This method is not intended to be re-implemented or extended by clients.
+		 */
+		protected internal m2() {
+			return null;
+		}
+		
+		/**
+		 * @return
+		 * @noreference This method is not intended to be referenced by clients.
+		 * @nooverride This method is not intended to be re-implemented or extended by clients.
+		 */
+		public Iinternal m3() {
+			return null;
+		}
+		
+		/**
+		 * @return
+		 * @noreference This method is not intended to be referenced by clients.
+		 * @nooverride This method is not intended to be re-implemented or extended by clients.
+		 */
+		protected Iinternal m4() {
+			return null;
+		}
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMRL2.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMRL2.java
new file mode 100644
index 0000000000..e313160334
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMRL2.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public class testMRL2 {
+	private internal m1() {
+		return null;
+	}
+	
+	private internal m2() {
+		return null;
+	}
+	
+	private Iinternal m3() {
+		return null;
+	}
+	
+	private Iinternal m4() {
+		return null;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMRL3.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMRL3.java
new file mode 100644
index 0000000000..185ff36ac5
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMRL3.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public class testMRL3 {
+
+	public static class inner {
+		public internal m1() {
+			return null;
+		}
+		
+		protected internal m2() {
+			return null;
+		}
+		
+		public Iinternal m3() {
+			return null;
+		}
+		
+		protected Iinternal m4() {
+			return null;
+		}
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMRL4.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMRL4.java
new file mode 100644
index 0000000000..9bb0527457
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMRL4.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public class testMRL4 {
+
+	public static class inner {
+		private internal m1() {
+			return null;
+		}
+		
+		private internal m2() {
+			return null;
+		}
+		
+		private Iinternal m3() {
+			return null;
+		}
+		
+		private Iinternal m4() {
+			return null;
+		}
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMRL5.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMRL5.java
new file mode 100644
index 0000000000..7d9e1386df
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMRL5.java
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public class testMRL5 {
+	public static class inner {
+		public static class inner2 {
+			public internal[] m1() {
+				return null;
+			}
+			
+			protected internal m2() {
+				return null;
+			}
+		}
+	}
+	
+	public static class inner2 {
+		public Iinternal[] m3() {
+			return null;
+		}
+		
+		protected Iinternal m4() {
+			return null;
+		}
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMRL6.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMRL6.java
new file mode 100644
index 0000000000..a20ae772d2
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMRL6.java
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public class testMRL6 {
+	public static class inner {
+		public static class inner2 {
+			private internal[] m1() {
+				return null;
+			}
+			
+			private internal m2() {
+				return null;
+			}
+		}
+	}
+	
+	public static class inner2 {
+		private Iinternal[] m3() {
+			return null;
+		}
+		
+		private Iinternal m4() {
+			return null;
+		}
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMRL7.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMRL7.java
new file mode 100644
index 0000000000..8edf777b89
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMRL7.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public class testMRL7 {
+	public static class inner {
+		public static abstract class inner2 {
+			public abstract internal[] m1();
+			
+			protected abstract internal m2();
+		}
+	}
+	
+	public static abstract class inner2 {
+		public abstract Iinternal[] m3();
+		
+		protected abstract Iinternal m4();
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMRL8.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMRL8.java
new file mode 100644
index 0000000000..d38bd1b6b1
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMRL8.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public abstract class testMRL8 {
+	public abstract internal[] m1();
+	
+	protected abstract internal m2();
+	
+	public abstract Iinternal[] m3();
+	
+	protected abstract Iinternal m4();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMRL9.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMRL9.java
new file mode 100644
index 0000000000..3717156fc3
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/leak/method/testMRL9.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import internal.x.y.z.Iinternal;
+import internal.x.y.z.internal;
+
+/**
+ * 
+ */
+public final class testMRL9 {
+	public final internal m1() {
+		return null;
+	}
+	
+	protected final internal m2() {
+		return null;
+	}
+	
+	public Iinternal m3() {
+		return null;
+	}
+	
+	protected Iinternal m4() {
+		return null;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/perf/bin-baseline.zip b/apitools/org.eclipse.pde.api.tools.tests/test-builder/perf/bin-baseline.zip
new file mode 100644
index 0000000000..39e356809f
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/perf/bin-baseline.zip
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/perf/jdtui-source.zip b/apitools/org.eclipse.pde.api.tools.tests/test-builder/perf/jdtui-source.zip
new file mode 100644
index 0000000000..9de4cbf3cd
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/perf/jdtui-source.zip
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/perf/source-ws.zip b/apitools/org.eclipse.pde.api.tools.tests/test-builder/perf/source-ws.zip
new file mode 100644
index 0000000000..d5d26a7737
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/perf/source-ws.zip
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test1.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test1.java
new file mode 100644
index 0000000000..af6f60227b
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test1.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noreference tag on an annotation
+ * @noreference
+ */
+public @interface test1 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test10.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test10.java
new file mode 100644
index 0000000000..626d275251
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test10.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+
+/**
+ * Test unsupported @noextend tag on an annotation in the default package
+ * @noextend
+ */
+public @interface test10 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test11.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test11.java
new file mode 100644
index 0000000000..baaa662a24
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test11.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @nooverride tag on an annotation
+ * @nooverride
+ */
+public @interface test11 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test12.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test12.java
new file mode 100644
index 0000000000..f4bbd18d27
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test12.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid @nooverride tag on an outer annotation
+ */
+public @interface test12 {
+
+}
+
+/**
+ * @nooverride
+ */
+@interface outer {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test13.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test13.java
new file mode 100644
index 0000000000..67635ff48f
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test13.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests an invalid @nooverride tag on a member annotation
+ */
+public @interface test13 {
+
+	/**
+	 * @nooverride
+	 */
+	@interface inner {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test14.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test14.java
new file mode 100644
index 0000000000..7402d021ef
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test14.java
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid @nooverride tags on nested inner annotations
+ * @nooverride
+ */
+public @interface test14 {
+
+	/**
+	 * @nooverride
+	 */
+	@interface inner {
+		
+	}
+	
+	@interface inner1 {
+		/**
+		 * @nooverride
+		 */
+		@interface inner2 {
+			
+		}
+	}
+	
+	@interface inner2 {
+		
+	}
+}
+
+@interface outer {
+	
+	/**
+	 * @nooverride
+	 */
+	@interface inner {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test15.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test15.java
new file mode 100644
index 0000000000..7ce15881ce
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test15.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+
+/**
+ * Test unsupported @nooverride tag on an annotation
+ * @nooverride
+ */
+public @interface test15 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test16.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test16.java
new file mode 100644
index 0000000000..d5bc832532
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test16.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported tags on an annotation
+ * @noreference
+ * @nooverride
+ * @noextend
+ * @noinstantiate
+ */
+public @interface test16 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test17.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test17.java
new file mode 100644
index 0000000000..15337188d3
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test17.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid tags on an outer annotation
+ */
+public @interface test17 {
+
+}
+
+/**
+ * @noreference
+ * @nooverride
+ * @noextend
+ * @noinstantiate
+ */
+@interface outer {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test18.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test18.java
new file mode 100644
index 0000000000..7a4e4609a7
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test18.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid tags on a member annotation
+ */
+public @interface test18 {
+
+	/**
+	 * @noreference
+	 * @nooverride
+	 * @noextend
+	 * @noinstantiate
+	 */
+	@interface inner {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test19.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test19.java
new file mode 100644
index 0000000000..0811651378
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test19.java
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid tags on nested inner annotations
+ * @noreference
+ * @nooverride
+ * @noextend
+ * @noinstantiate
+ */
+public @interface test19 {
+
+	/**
+	 * @noreference
+	 * @nooverride
+	 * @noextend
+	 * @noinstantiate
+	 */
+	@interface inner {
+		
+	}
+	
+	@interface inner1 {
+		/**
+		 * @noreference
+		 * @nooverride
+		 * @noextend
+		 * @noinstantiate
+		 */
+		@interface inner2 {
+			
+		}
+	}
+	
+	@interface inner2 {
+		
+	}
+}
+
+@interface outer {
+	
+	/**
+	 * @noreference
+	 * @nooverride
+	 * @noextend
+	 * @noinstantiate
+	 */
+	@interface inner {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test2.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test2.java
new file mode 100644
index 0000000000..780d6a0390
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test2.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid @noreference tag on outer annotation
+ */
+public @interface test2 {
+
+}
+
+/**
+ * @noreference
+ */
+@interface outer {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test20.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test20.java
new file mode 100644
index 0000000000..1b1880c870
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test20.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+
+/**
+ * Test unsupported @noreference tag on an annotation in the default package
+ * @noreference
+ * @nooverride
+ * @noextend
+ * @noinstantiate
+ */
+public @interface test20 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test21.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test21.java
new file mode 100644
index 0000000000..f0d1720698
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test21.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noinstantiate tag on an annotation
+ * @noinstantiate
+ */
+public @interface test21 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test22.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test22.java
new file mode 100644
index 0000000000..3a2eef33a8
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test22.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid @noinstantiate tag on outer annotation
+ */
+public @interface test22 {
+
+}
+
+/**
+ * @noinstantiate
+ */
+@interface OuterNoRef2 {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test23.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test23.java
new file mode 100644
index 0000000000..b2533315d2
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test23.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests an invalid @noinstantiate tag on a member annotation
+ */
+public @interface test23 {
+
+	/**
+	 * @noinstantiate
+	 */
+	@interface InnerNoRef3 {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test24.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test24.java
new file mode 100644
index 0000000000..126d6685c4
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test24.java
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid @noinstantiate tags on nested inner annotations
+ * @noinstantiate
+ */
+public @interface test24 {
+
+	/**
+	 * @noinstantiate
+	 */
+	@interface inner {
+		
+	}
+	
+	@interface inner1 {
+		/**
+		 * @noinstantiate
+		 */
+		@interface inner2 {
+			
+		}
+	}
+	
+	@interface inner2 {
+		
+	}
+}
+
+@interface outer {
+	
+	/**
+	 * @noinstantiate
+	 */
+	@interface inner {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test25.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test25.java
new file mode 100644
index 0000000000..b27a53f2f4
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test25.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+
+/**
+ * Test unsupported @noinstantiate tag on an annotation in the default package
+ * @noinstantiate
+ */
+public @interface test25 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test26.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test26.java
new file mode 100644
index 0000000000..dbc97ce1e3
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test26.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noimplement tag on an annotation
+ * @noimplement
+ */
+public @interface test21 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test27.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test27.java
new file mode 100644
index 0000000000..6baa04220d
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test27.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid @noimplement tag on outer annotation
+ */
+public @interface test22 {
+
+}
+
+/**
+ * @noimplement
+ */
+@interface OuterNoRef2 {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test28.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test28.java
new file mode 100644
index 0000000000..be8624634d
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test28.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests an invalid @noimplement tag on a member annotation
+ */
+public @interface test23 {
+
+	/**
+	 * @noimplement
+	 */
+	@interface InnerNoRef3 {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test29.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test29.java
new file mode 100644
index 0000000000..1b77d24257
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test29.java
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid @noimplement tags on nested inner annotations
+ * @noimplement
+ */
+public @interface test24 {
+
+	/**
+	 * @noimplement
+	 */
+	@interface inner {
+		
+	}
+	
+	@interface inner1 {
+		/**
+		 * @noimplement
+		 */
+		@interface inner2 {
+			
+		}
+	}
+	
+	@interface inner2 {
+		
+	}
+}
+
+@interface outer {
+	
+	/**
+	 * @noimplement
+	 */
+	@interface inner {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test3.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test3.java
new file mode 100644
index 0000000000..7eb3e31492
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test3.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests an invalid @noreference tag on a member annotation
+ */
+public @interface test3 {
+
+	/**
+	 * @noreference
+	 */
+	@interface inner {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test30.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test30.java
new file mode 100644
index 0000000000..9ab81c7b42
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test30.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+
+/**
+ * Test unsupported @noimplement tag on an annotation in the default package
+ * @noimplement
+ */
+public @interface test25 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test4.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test4.java
new file mode 100644
index 0000000000..12f5684547
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test4.java
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid @noreference tags on nested inner annotations
+ * @noreference
+ */
+public @interface test4 {
+
+	/**
+	 * @noreference
+	 */
+	@interface inner {
+		
+	}
+	
+	@interface inner1 {
+		/**
+		 * @noreference
+		 */
+		@interface inner2 {
+			
+		}
+	}
+	
+	@interface inner2 {
+		
+	}
+}
+
+@interface outer {
+	
+	/**
+	 * @noreference
+	 */
+	@interface inner {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test5.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test5.java
new file mode 100644
index 0000000000..85ef7969a3
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test5.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+
+/**
+ * Test unsupported @noreference tag on an annotation in the default package
+ * @noreference
+ */
+public @interface test5 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test6.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test6.java
new file mode 100644
index 0000000000..5ef349a586
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test6.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noextend tag on an annotation
+ * @noextend
+ */
+public @interface test6 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test7.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test7.java
new file mode 100644
index 0000000000..26b9c9e6e5
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test7.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid @noextend tag on an outer annotation
+ */
+public @interface test7 {
+
+}
+
+/**
+ * @noextend
+ */
+@interface outer {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test8.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test8.java
new file mode 100644
index 0000000000..87eea50453
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test8.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests an invalid @noextend tag on a member annotation
+ */
+public @interface test8 {
+
+	/**
+	 * @noextend
+	 */
+	@interface inner {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test9.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test9.java
new file mode 100644
index 0000000000..6c2f2531e1
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/annotation/test9.java
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid @noextend tags on nested inner annotations
+ * @noextend
+ */
+public @interface test9 {
+
+	/**
+	 * @noextend
+	 */
+	@interface inner {
+		
+	}
+	
+	@interface inner1 {
+		/**
+		 * @noextend
+		 */
+		@interface inner2 {
+			
+		}
+	}
+	
+	@interface inner2 {
+		
+	}
+}
+
+@interface outer {
+	
+	/**
+	 * @noextend
+	 */
+	@interface inner {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test1.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test1.java
new file mode 100644
index 0000000000..c29044055f
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test1.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noreference tag on a class
+ * @noreference
+ */
+public class test1 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test10.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test10.java
new file mode 100644
index 0000000000..8af5682160
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test10.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+
+/**
+ * Test unsupported @noimplement tag on a class in the default package
+ * @noimplement
+ */
+public class test10 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test11.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test11.java
new file mode 100644
index 0000000000..db5e840f82
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test11.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @nooverride tag on class
+ * @nooverride
+ */
+public class test11 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test12.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test12.java
new file mode 100644
index 0000000000..079fb6d457
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test12.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid @nooverride tag on outer type
+ */
+public class test12 {
+
+}
+
+/**
+ * @nooverride
+ */
+class OuterNoRef2 {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test13.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test13.java
new file mode 100644
index 0000000000..41bf3421f9
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test13.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests an invalid @nooverride tag on a member type
+ */
+public class test13 {
+
+	/**
+	 * @nooverride
+	 */
+	class InnerNoRef3 {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test14.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test14.java
new file mode 100644
index 0000000000..cbc85c8ef6
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test14.java
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid @nooverride tags on nested inner types
+ * @nooverride
+ */
+public class test14 {
+
+	/**
+	 * @nooverride
+	 */
+	class InnerNoRef4 {
+		
+	}
+	
+	class InnerNoRef4_1 {
+		/**
+		 * @nooverride
+		 */
+		class Inner2NoRef4 {
+			
+		}
+	}
+	
+	class InnerNoRef4_2 {
+		
+	}
+}
+
+class OuterNoRef4 {
+	
+	/**
+	 * @nooverride
+	 */
+	class InnerNoRef4 {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test15.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test15.java
new file mode 100644
index 0000000000..a2611c0ec6
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test15.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+
+/**
+ * Test unsupported @nooverride tag on class
+ * @nooverride
+ */
+public class test15 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test16.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test16.java
new file mode 100644
index 0000000000..b75e5f0ed2
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test16.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported tags on a class
+ * @noreference
+ * @nooverride
+ * @noimplement
+ */
+public class test16 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test17.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test17.java
new file mode 100644
index 0000000000..dc14d1ae12
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test17.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid tags on an outer type
+ */
+public class test17 {
+
+}
+
+/**
+ * @noreference
+ * @nooverride
+ * @noimplement
+ */
+class OuterNoRef2 {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test18.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test18.java
new file mode 100644
index 0000000000..3a2c1620cf
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test18.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid tags on a member type
+ */
+public class test18 {
+
+	/**
+	 * @noreference
+	 * @nooverride
+	 * @noimplement
+	 */
+	class InnerNoRef3 {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test19.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test19.java
new file mode 100644
index 0000000000..a96dea00f9
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test19.java
@@ -0,0 +1,56 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid tags on nested inner types
+ * @noreference
+ * @nooverride
+ * @noimplement
+ */
+public class test19 {
+
+	/**
+	 * @noreference
+	 * @nooverride
+	 * @noimplement
+	 */
+	class InnerNoRef4 {
+		
+	}
+	
+	class InnerNoRef4_1 {
+		/**
+		 * @noreference
+		 * @nooverride
+		 * @noimplement
+		 */
+		class Inner2NoRef4 {
+			
+		}
+	}
+	
+	class InnerNoRef4_2 {
+		
+	}
+}
+
+class OuterNoRef4 {
+	
+	/**
+	 * @noreference
+	 * @nooverride
+	 * @noimplement
+	 */
+	class InnerNoRef4 {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test2.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test2.java
new file mode 100644
index 0000000000..26db75b4cf
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test2.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid @noreference tag on an outer class
+ */
+public class test2 {
+
+}
+
+/**
+ * @noreference
+ */
+class outer {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test20.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test20.java
new file mode 100644
index 0000000000..8c419c8627
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test20.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+
+/**
+ * Test unsupported @noreference tag on class in the default package
+ * @noreference
+ * @nooverride
+ * @noimplement
+ */
+public class test20 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test21.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test21.java
new file mode 100644
index 0000000000..6c69a6621b
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test21.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+
+/**
+ * Test unsupported @noextend tag on a final class in the default package
+ * @noextend
+ */
+public final class test21 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test22.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test22.java
new file mode 100644
index 0000000000..5b53ce0a32
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test22.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noextend tag on a final class
+ * @noextend
+ */
+public final class test22 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test23.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test23.java
new file mode 100644
index 0000000000..73b9bd2705
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test23.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid @noextend tag on a final outer class
+ */
+public class test23 {
+
+}
+
+/**
+ * @noextend
+ */
+final class outer {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test24.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test24.java
new file mode 100644
index 0000000000..e09932c2c7
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test24.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests an invalid @noextend tag on a final member class
+ */
+public class test24 {
+
+	/**
+	 * @noextend
+	 */
+	final class inner {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test25.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test25.java
new file mode 100644
index 0000000000..5018c602be
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test25.java
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid @noextend tags on nested final inner classes
+ */
+public class test25 {
+
+	/**
+	 * @noextend
+	 */
+	final class inner {
+		
+	}
+	
+	class inner2 {
+		/**
+		 * @noextend
+		 */
+		final class inner3 {
+			
+		}
+	}
+}
+
+class outer {
+	
+	/**
+	 * @noextend
+	 */
+	final class inner {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test3.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test3.java
new file mode 100644
index 0000000000..9eb564ba5a
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test3.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests an invalid @noreference tag on a member class
+ */
+public class test3 {
+
+	/**
+	 * @noreference
+	 */
+	class inner {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test4.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test4.java
new file mode 100644
index 0000000000..951fe482a6
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test4.java
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid @noreference tags on nested inner classes
+ * @noreference
+ */
+public class test4 {
+
+	/**
+	 * @noreference
+	 */
+	class inner {
+		
+	}
+	
+	class inner2 {
+		/**
+		 * @noreference
+		 */
+		class inner3 {
+			
+		}
+	}
+	
+	class inner4 {
+		
+	}
+}
+
+class outer {
+	
+	/**
+	 * @noreference
+	 */
+	class inner {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test5.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test5.java
new file mode 100644
index 0000000000..4f3d54c6d6
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test5.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+
+/**
+ * Test unsupported @noreference tag on class in the default package
+ * @noreference
+ */
+public class test5 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test6.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test6.java
new file mode 100644
index 0000000000..80811de0fe
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test6.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noimplement tag on class
+ * @noimplement
+ */
+public class test6 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test7.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test7.java
new file mode 100644
index 0000000000..dea15ab3d7
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test7.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid @noimplement tag on outer type
+ */
+public class test7 {
+
+}
+
+/**
+ * @noimplement
+ */
+class OuterNoRef2 {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test8.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test8.java
new file mode 100644
index 0000000000..dd3322ac38
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test8.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests an invalid @noimplement tag on a member type
+ */
+public class test8 {
+
+	/**
+	 * @noimplement
+	 */
+	class InnerNoRef3 {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test9.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test9.java
new file mode 100644
index 0000000000..296dc26e1a
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/test9.java
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid @noimplement tags on nested inner types
+ * @noimplement
+ */
+public class test9 {
+
+	/**
+	 * @noimplement
+	 */
+	class InnerNoRef4 {
+		
+	}
+	
+	class InnerNoRef4_1 {
+		/**
+		 * @noimplement
+		 */
+		class Inner2NoRef4 {
+			
+		}
+	}
+	
+	class InnerNoRef4_2 {
+		
+	}
+}
+
+class OuterNoRef4 {
+	
+	/**
+	 * @noimplement
+	 */
+	class InnerNoRef4 {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/valid/test1.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/valid/test1.java
new file mode 100644
index 0000000000..b11693fb51
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/valid/test1.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test valid tags on a class
+ * @noextend This class is not intended to be subclassed by clients.
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class test1 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/valid/test2.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/valid/test2.java
new file mode 100644
index 0000000000..91a7e7aad3
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/valid/test2.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests valid tags on an outer type
+ */
+public class test2 {
+
+}
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+class outer {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/valid/test3.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/valid/test3.java
new file mode 100644
index 0000000000..a20a101b1f
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/valid/test3.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests valid tags on a member type
+ */
+public class test3 {
+
+	/**
+	 * @noextend This class is not intended to be subclassed by clients.
+	 * @noinstantiate This class is not intended to be instantiated by clients.
+	 */
+	class inner {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/valid/test4.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/valid/test4.java
new file mode 100644
index 0000000000..2289e0100f
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/valid/test4.java
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests valid tags on nested inner types
+ * @noextend This class is not intended to be subclassed by clients.
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class test4 {
+
+	/**
+	 * @noextend This class is not intended to be subclassed by clients.
+	 * @noinstantiate This class is not intended to be instantiated by clients.
+	 */
+	class inner {
+		
+	}
+	
+	class inner2 {
+		/**
+		 * @noextend This class is not intended to be subclassed by clients.
+		 * @noinstantiate This class is not intended to be instantiated by clients.
+		 */
+		class inner3 {
+			
+		}
+	}
+}
+
+class outer {
+	
+	/**
+	 * @noextend This class is not intended to be subclassed by clients.
+	 * @noinstantiate This class is not intended to be instantiated by clients.
+	 */
+	class inner {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/valid/test5.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/valid/test5.java
new file mode 100644
index 0000000000..b12780601a
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/class/valid/test5.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+
+/**
+ * Test valid tags on class in the default package
+ * @noextend This class is not intended to be subclassed by clients.
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class test5 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test1.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test1.java
new file mode 100644
index 0000000000..756b7501ee
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test1.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noreference tag on an enum
+ * @noreference
+ */
+public enum test1 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test10.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test10.java
new file mode 100644
index 0000000000..64b271096b
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test10.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+
+/**
+ * Test unsupported @noextend tag on an annotation in the default package
+ * @noextend
+ */
+public enum test10 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test11.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test11.java
new file mode 100644
index 0000000000..f3a148f5ce
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test11.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @nooverride tag on an enum
+ * @nooverride
+ */
+public enum test11 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test12.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test12.java
new file mode 100644
index 0000000000..bbca1d453e
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test12.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid @nooverride tag on an outer enum
+ */
+public enum test12 {
+
+}
+
+/**
+ * @nooverride
+ */
+enum outer {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test13.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test13.java
new file mode 100644
index 0000000000..7601fc8528
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test13.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests an invalid @nooverride tag on a member enum
+ */
+public enum test13 {
+
+	A;
+	/**
+	 * @nooverride
+	 */
+	enum inner {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test14.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test14.java
new file mode 100644
index 0000000000..e2bcba7f52
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test14.java
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid @nooverride tags on nested inner enums
+ * @nooverride
+ */
+public enum test14 {
+
+	A;
+	/**
+	 * @nooverride
+	 */
+	enum inner {
+		
+	}
+	
+	enum inner1 {
+		A;
+		/**
+		 * @nooverride
+		 */
+		enum inner2 {
+			
+		}
+	}
+	
+	enum inner2 {
+		
+	}
+}
+
+enum outer {
+	A;
+	/**
+	 * @nooverride
+	 */
+	enum InnerNoRef4 {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test15.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test15.java
new file mode 100644
index 0000000000..e6293cb268
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test15.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+
+/**
+ * Test unsupported @nooverride tag on an enum
+ * @nooverride
+ */
+public enum test15 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test16.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test16.java
new file mode 100644
index 0000000000..83943b8937
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test16.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported tags on an enum
+ * @noreference
+ * @nooverride
+ * @noextend
+ * @noinstantiate
+ * @noimplement
+ */
+public enum test16 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test17.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test17.java
new file mode 100644
index 0000000000..5d37564381
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test17.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid tags on an outer enum
+ */
+public enum test17 {
+
+}
+
+/**
+ * @noreference
+ * @nooverride
+ * @noextend
+ * @noinstantiate
+ * @noimplement
+ */
+enum outer {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test18.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test18.java
new file mode 100644
index 0000000000..b6bb9e0cd0
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test18.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid tags on a member enum
+ */
+public enum test18 {
+
+	A;
+	/**
+	 * @noreference
+	 * @nooverride
+	 * @noextend
+	 * @noinstantiate
+	 * @noimplement
+	 */
+	enum inner {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test19.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test19.java
new file mode 100644
index 0000000000..dc17d6ebe1
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test19.java
@@ -0,0 +1,67 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid tags on nested inner enums
+ * @noreference
+ * @nooverride
+ * @noextend
+ * @noinstantiate
+ * @noimplement
+ */
+public enum test19 {
+
+	A;
+	/**
+	 * @noreference
+	 * @nooverride
+	 * @noextend
+	 * @noinstantiate
+	 * @noimplement
+	 */
+	enum inner {
+		
+	}
+	
+	enum inner1 {
+		A;
+		/**
+		 * @noreference
+		 * @nooverride
+		 * @noextend
+		 * @noinstantiate
+		 * @noimplement
+		 */
+		enum inner2 {
+			
+		}
+	}
+	
+	enum inner2 {
+		
+	}
+}
+
+enum outer {
+	
+	A;
+	/**
+	 * @noreference
+	 * @nooverride
+	 * @noextend
+	 * @noinstantiate
+	 * @noimplement
+	 */
+	enum inner {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test2.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test2.java
new file mode 100644
index 0000000000..d6105b9dc0
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test2.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid @noreference tag on outer enum
+ */
+public enum test2 {
+
+}
+
+/**
+ * @noreference
+ */
+enum outer {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test20.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test20.java
new file mode 100644
index 0000000000..0d1a4f7046
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test20.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+
+/**
+ * Test unsupported @noreference tag on an enum in the default package
+ * @noreference
+ * @nooverride
+ * @noextend
+ * @noinstantiate
+ * @noimplement
+ */
+public enum test20 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test21.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test21.java
new file mode 100644
index 0000000000..7c4051524f
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test21.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noinstantiate tag on an enum
+ * @noinstantiate
+ */
+public enum test21 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test22.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test22.java
new file mode 100644
index 0000000000..372213a6f2
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test22.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid @noinstantiate tag on outer enum
+ */
+public enum test22 {
+
+}
+
+/**
+ * @noinstantiate
+ */
+enum outer {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test23.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test23.java
new file mode 100644
index 0000000000..37cc67e61c
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test23.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests an invalid @noinstantiate tag on a member enum
+ */
+public enum test23 {
+
+	A;
+	/**
+	 * @noinstantiate
+	 */
+	enum inner {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test24.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test24.java
new file mode 100644
index 0000000000..3028c4e853
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test24.java
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid @noinstantiate tags on nested inner enums
+ * @noinstantiate
+ */
+public enum test24 {
+
+	A;
+	/**
+	 * @noinstantiate
+	 */
+	enum inner {
+		
+	}
+	
+	enum inner1 {
+		A;
+		/**
+		 * @noinstantiate
+		 */
+		enum inner2 {
+			
+		}
+	}
+	
+	enum inner2 {
+		
+	}
+}
+
+enum outer {
+	A;
+	/**
+	 * @noinstantiate
+	 */
+	enum inner {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test25.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test25.java
new file mode 100644
index 0000000000..bb6158f400
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test25.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+
+/**
+ * Test unsupported @noinstantiate tag on an enum in the default package
+ * @noinstantiate
+ */
+public enum test25 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test26.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test26.java
new file mode 100644
index 0000000000..dff1a75d8f
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test26.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noimplement tag on an enum
+ * @noimplement
+ */
+public enum test26 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test27.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test27.java
new file mode 100644
index 0000000000..a799a2f44a
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test27.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid @noimplement tag on outer enum
+ */
+public enum test27 {
+
+}
+
+/**
+ * @noimplement
+ */
+enum outer {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test28.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test28.java
new file mode 100644
index 0000000000..6e8cf1e6fb
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test28.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests an invalid @noimplement tag on a member enum
+ */
+public enum test28 {
+
+	A;
+	/**
+	 * @noimplement
+	 */
+	enum inner {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test29.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test29.java
new file mode 100644
index 0000000000..8867de7313
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test29.java
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid @noimplement tags on nested inner enums
+ * @noimplement
+ */
+public enum test29 {
+
+	A;
+	/**
+	 * @noimplement
+	 */
+	enum inner {
+		
+	}
+	
+	enum inner1 {
+		A;
+		/**
+		 * @noimplement
+		 */
+		enum inner2 {
+			
+		}
+	}
+	
+	enum inner2 {
+		
+	}
+}
+
+enum outer {
+	A;
+	/**
+	 * @noimplement
+	 */
+	enum inner {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test3.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test3.java
new file mode 100644
index 0000000000..a7ed0cbb2c
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test3.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests an invalid @noreference tag on a member enum
+ */
+public enum test3 {
+
+	A;
+	
+	/**
+	 * @noreference
+	 */
+	enum inner {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test30.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test30.java
new file mode 100644
index 0000000000..d9315a60c3
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test30.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+
+/**
+ * Test unsupported @noimplement tag on an enum in the default package
+ * @noimplement
+ */
+public enum test30 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test4.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test4.java
new file mode 100644
index 0000000000..8b4b95519d
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test4.java
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid @noreference tags on nested inner enums
+ * @noreference
+ */
+public enum test4 {
+
+	A;
+	/**
+	 * @noreference
+	 */
+	enum inner {
+		
+	}
+	
+	enum inner1 {
+		A;
+		/**
+		 * @noreference
+		 */
+		enum inner2 {
+			
+		}
+	}
+	
+	enum inner2 {
+		
+	}
+}
+
+enum outer {
+	A;
+	/**
+	 * @noreference
+	 */
+	enum inner {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test5.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test5.java
new file mode 100644
index 0000000000..bd28f5de1e
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test5.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+
+/**
+ * Test unsupported @noreference tag on an annotation in the default package
+ * @noreference
+ */
+public enum test5 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test6.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test6.java
new file mode 100644
index 0000000000..f1022acd20
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test6.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noextend tag on an enum
+ * @noextend
+ */
+public enum test6 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test7.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test7.java
new file mode 100644
index 0000000000..613240ea2e
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test7.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid @noextend tag on an outer enum
+ */
+public enum test7 {
+
+}
+
+/**
+ * @noextend
+ */
+enum outer {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test8.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test8.java
new file mode 100644
index 0000000000..bbeadd512d
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test8.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests an invalid @noextend tag on a member enum
+ */
+public enum test8 {
+
+	A;
+	/**
+	 * @noextend
+	 */
+	enum InnerNoRef3 {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test9.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test9.java
new file mode 100644
index 0000000000..d1f9dc8f57
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/enum/test9.java
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid @noextend tags on nested inner enums
+ * @noextend
+ */
+public enum test9 {
+
+	A;
+	/**
+	 * @noextend
+	 */
+	enum inner {
+		
+	}
+	
+	enum inner1 {
+		A;
+		/**
+		 * @noextend
+		 */
+		enum inner2 {
+			
+		}
+	}
+	
+	enum inner2 {
+		
+	}
+}
+
+enum outer {
+	A;
+	/**
+	 * @noextend
+	 */
+	enum inner {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test1.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test1.java
new file mode 100644
index 0000000000..9e06b6f850
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test1.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noextend tag on a field in an annotation
+ */
+public @interface test1 {
+	/**
+	 * @noextend
+	 */
+	public Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test10.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test10.java
new file mode 100644
index 0000000000..ad37771503
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test10.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test unsupported @noinstantiate tag on a field in an annotation in the default package
+ */
+public @interface test10 {
+	/**
+	 * @noinstantiate
+	 */
+	public Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test11.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test11.java
new file mode 100644
index 0000000000..40f94cc708
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test11.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noimplement tag on a field in an annotation
+ */
+public @interface test11 {
+	/**
+	 * @noimplement
+	 */
+	public Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test12.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test12.java
new file mode 100644
index 0000000000..dd443819cf
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test12.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noimplement tag on an outer annotation field
+ */
+public @interface test12 {
+	
+}
+
+@interface outer {
+	/**
+	 * @noimplement
+	 */
+	public static Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test13.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test13.java
new file mode 100644
index 0000000000..901d7b7c4d
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test13.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noimplement tag on a field in an inner annotation
+ */
+public @interface test13 {
+	@interface inner {
+		/**
+		 * @noimplement
+		 */
+		public Object f1 = null;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test14.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test14.java
new file mode 100644
index 0000000000..57b94bd0b0
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test14.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noimplement tag on fields in outer / inner annotation
+ */
+public @interface test14 {
+	@interface inner {
+		/**
+		 * @noimplement
+		 */
+		public int f2 = 0;
+		@interface inner2 {
+			/**
+			 * @noimplement
+			 */
+			public char[] f3 = {};
+		}
+	}
+}
+
+@interface outer {
+	/**
+	 * @noimplement
+	 */
+	public static Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test15.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test15.java
new file mode 100644
index 0000000000..b2272765c7
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test15.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test unsupported @noimplement tag on a field in an annotation in the default package
+ */
+public @interface test15 {
+	/**
+	 * @noimplement
+	 */
+	public Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test16.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test16.java
new file mode 100644
index 0000000000..0212f90f30
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test16.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @nooverride tag on a field in an annotation
+ */
+public @interface test16 {
+	/**
+	 * @nooverride
+	 */
+	public Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test17.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test17.java
new file mode 100644
index 0000000000..cd4e2b5458
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test17.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @nooverride tag on an outer annotation field
+ */
+public @interface test17 {
+	
+}
+
+@interface outer {
+	/**
+	 * @nooverride
+	 */
+	public static Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test18.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test18.java
new file mode 100644
index 0000000000..ca15ca8e77
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test18.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @nooverride tag on a field in an inner annotation
+ */
+public @interface test18 {
+	@interface inner {
+		/**
+		 * @nooverride
+		 */
+		public Object f1 = null;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test19.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test19.java
new file mode 100644
index 0000000000..e46dc3f02c
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test19.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @nooverride tag on fields in outer / inner annotation
+ */
+public @interface test19 {
+	@interface inner {
+		/**
+		 * @nooverride
+		 */
+		public int f2 = 0;
+		@interface inner2 {
+			/**
+			 * @nooverride
+			 */
+			public char[] f3 = {};
+		}
+	}
+}
+
+@interface outer {
+	/**
+	 * @nooverride
+	 */
+	public static Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test2.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test2.java
new file mode 100644
index 0000000000..5555a980cd
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test2.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noextend tag on an outer annotation field
+ */
+public @interface test2 {
+	
+}
+
+@interface outer {
+	/**
+	 * @noextend
+	 */
+	public static Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test20.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test20.java
new file mode 100644
index 0000000000..32a28ff6cd
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test20.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test unsupported @nooverride tag on a field in an annotation in the default package
+ */
+public @interface test20 {
+	/**
+	 * @nooverride
+	 */
+	public Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test21.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test21.java
new file mode 100644
index 0000000000..659e665332
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test21.java
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported tags on fields in outer / inner annotation
+ */
+public @interface test21 {
+	@interface inner {
+		/**
+		 * @nooverride
+		 * @noimplement
+		 * @noinstantiate
+		 * @noextend
+		 * @noreference
+		 */
+		public int f2 = 0;
+		@interface inner2 {
+			/**
+			 * @nooverride
+			 * @noimplement
+			 * @noinstantiate
+			 * @noextend
+			 * @noreference
+			 */
+			public char[] f3 = {};
+		}
+	}
+}
+
+@interface outer {
+	/**
+	 * @nooverride
+	 * @noimplement
+	 * @noinstantiate
+	 * @noextend
+	 * @noreference
+	 */
+	public static Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test22.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test22.java
new file mode 100644
index 0000000000..d76d43d3a9
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test22.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noreference tag on a final field in an annotation
+ */
+public @interface test22 {
+	/**
+	 * @noreference
+	 */
+	public final Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test23.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test23.java
new file mode 100644
index 0000000000..126c4e754d
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test23.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noreference tag on an outer annotation field
+ */
+public @interface test23 {
+	
+}
+
+@interface outer {
+	/**
+	 * @noreference
+	 */
+	public Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test24.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test24.java
new file mode 100644
index 0000000000..d8b7ec2fb9
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test24.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noreference tag on a final field in an inner annotation
+ */
+public @interface test24 {
+	@interface inner {
+		/**
+		 * @noreference
+		 */
+		public final Object f1 = null;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test25.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test25.java
new file mode 100644
index 0000000000..8f03c62ddb
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test25.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noreference tag on fields in outer / inner annotation
+ */
+public @interface test25 {
+	@interface inner {
+		/**
+		 * @noreference
+		 */
+		public final int f2 = 0;
+		@interface inner2 {
+			/**
+			 * @noreference
+			 */
+			public final char[] f3 = {};
+		}
+	}
+}
+
+@interface outer {
+	/**
+	 * @noreference
+	 */
+	public final Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test26.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test26.java
new file mode 100644
index 0000000000..e7f5290406
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test26.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test unsupported @noreference tag on a final field in an annotation in the default package
+ */
+public @interface test26 {
+	/**
+	 * @noreference
+	 */
+	public final Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test3.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test3.java
new file mode 100644
index 0000000000..76f47c927d
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test3.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noextend tag on a field in an inner annotation
+ */
+public @interface test3 {
+	@interface inner {
+		/**
+		 * @noextend
+		 */
+		public Object f1 = null;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test4.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test4.java
new file mode 100644
index 0000000000..3b73e5b3d1
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test4.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noextend tag on fields in outer / inner annotation
+ */
+public @interface test4 {
+	@interface inner {
+		/**
+		 * @noextend
+		 */
+		public int f2 = 0;
+		@interface inner2 {
+			/**
+			 * @noextend
+			 */
+			public char[] f3 = {};
+		}
+	}
+}
+
+@interface outer {
+	/**
+	 * @noextend
+	 */
+	public static Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test5.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test5.java
new file mode 100644
index 0000000000..f5ce04bd1b
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test5.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test unsupported @noextend tag on a field in an annotation in the default package
+ */
+public @interface test5 {
+	/**
+	 * @noextend
+	 */
+	public Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test6.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test6.java
new file mode 100644
index 0000000000..b9d555bb0d
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test6.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noinstantiate tag on a field in an annotation
+ */
+public @interface test6 {
+	/**
+	 * @noinstantiate
+	 */
+	public Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test7.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test7.java
new file mode 100644
index 0000000000..180b7f6d9c
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test7.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noinstantiate tag on an outer annotation field
+ */
+public @interface test7 {
+	
+}
+
+@interface outer {
+	/**
+	 * @noinstantiate
+	 */
+	public static Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test8.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test8.java
new file mode 100644
index 0000000000..0ac142d331
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test8.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noinstantiate tag on a field in an inner annotation
+ */
+public @interface test8 {
+	@interface inner {
+		/**
+		 * @noinstantiate
+		 */
+		public Object f1 = null;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test9.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test9.java
new file mode 100644
index 0000000000..7af671501a
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/annotation/test9.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noinstantiate tag on fields in outer / inner annotation
+ */
+public @interface test9 {
+	@interface inner {
+		/**
+		 * @noinstantiate
+		 */
+		public int f2 = 0;
+		@interface inner2 {
+			/**
+			 * @noinstantiate
+			 */
+			public char[] f3 = {};
+		}
+	}
+}
+
+@interface outer {
+	/**
+	 * @noinstantiate
+	 */
+	public static Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test1.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test1.java
new file mode 100644
index 0000000000..8c3d167785
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test1.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noreference tag on final fields in a class
+ */
+public class test1 {
+	/**
+	 * @noreference
+	 */
+	public final Object f1 = null;
+	/**
+	 * @noreference
+	 */
+	protected final int f2 = 0;
+	/**
+	 * @noreference
+	 */
+	private final char[] f3 = {};
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test10.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test10.java
new file mode 100644
index 0000000000..c4eb04212b
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test10.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test unsupported @noreference tag on static final fields in a class in the default package
+ */
+public class test10 {
+	/**
+	 * @noreference
+	 */
+	public static final Object f1 = null;
+	/**
+	 * @noreference
+	 */
+	protected static final int f2 = 0;
+	/**
+	 * @noreference
+	 */
+	private static final char[] f3 = {};
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test11.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test11.java
new file mode 100644
index 0000000000..e1e434f340
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test11.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noextend tag on fields in a class
+ */
+public class test11 {
+	/**
+	 * @noextend
+	 */
+	public Object f1 = null;
+	/**
+	 * @noextend
+	 */
+	protected int f2 = 0;
+	/**
+	 * @noextend
+	 */
+	private static char[] f3 = {};
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test12.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test12.java
new file mode 100644
index 0000000000..5727b86aa8
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test12.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noextend tag on fields in an outer class
+ */
+public class test12 {
+
+}
+
+class outer {
+	/**
+	 * @noextend
+	 */
+	public Object f1 = null;
+	/**
+	 * @noextend
+	 */
+	protected int f2 = 0;
+	/**
+	 * @noextend
+	 */
+	private static char[] f3 = {};
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test13.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test13.java
new file mode 100644
index 0000000000..5befa6ba64
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test13.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noextend tag on fields in an inner class
+ */
+public class test13 {
+	
+	static class inner {
+		/**
+		 * @noextend
+		 */
+		public Object f1 = null;
+		/**
+		 * @noextend
+		 */
+		protected int f2 = 0;
+		/**
+		 * @noextend
+		 */
+		private static char[] f3 = {};
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test14.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test14.java
new file mode 100644
index 0000000000..6ae6d1c801
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test14.java
@@ -0,0 +1,72 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noextend tag on fields in inner / outer classes
+ */
+public class test14 {
+	/**
+	 * @noextend
+	 */
+	public Object f1 = null;
+	/**
+	 * @noextend
+	 */
+	protected int f2 = 0;
+	/**
+	 * @noextend
+	 */
+	private char[] f3 = {};
+	static class inner {
+		/**
+		 * @noextend
+		 */
+		public static Object f1 = null;
+		/**
+		 * @noextend
+		 */
+		protected int f2 = 0;
+		/**
+		 * @noextend
+		 */
+		private static char[] f3 = {};
+		class inner2 {
+			/**
+			 * @noextend
+			 */
+			public Object f1 = null;
+			/**
+			 * @noextend
+			 */
+			protected int f2 = 0;
+			/**
+			 * @noextend
+			 */
+			private char[] f3 = {};
+		}
+	}
+}
+
+class outer {
+	/**
+	 * @noextend
+	 */
+	public Object f1 = null;
+	/**
+	 * @noextend
+	 */
+	protected int f2 = 0;
+	/**
+	 * @noextend
+	 */
+	private static char[] f3 = {};
+}
\ No newline at end of file
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test15.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test15.java
new file mode 100644
index 0000000000..17b8cb5386
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test15.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test unsupported @noextend tag on fields in a class in the default package
+ */
+public class test15 {
+	/**
+	 * @noextend
+	 */
+	public Object f1 = null;
+	/**
+	 * @noextend
+	 */
+	protected int f2 = 0;
+	/**
+	 * @noextend
+	 */
+	private static char[] f3 = {};
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test16.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test16.java
new file mode 100644
index 0000000000..d5b7612f02
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test16.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noimplement tag on fields in a class
+ */
+public class test16 {
+	/**
+	 * @noimplement
+	 */
+	public Object f1 = null;
+	/**
+	 * @noimplement
+	 */
+	protected int f2 = 0;
+	/**
+	 * @noimplement
+	 */
+	private static char[] f3 = {};
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test17.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test17.java
new file mode 100644
index 0000000000..3d8d7f23d5
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test17.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noimplement tag on fields in an outer class
+ */
+public class test17 {
+
+}
+
+class outer {
+	/**
+	 * @noimplement
+	 */
+	public Object f1 = null;
+	/**
+	 * @noimplement
+	 */
+	protected int f2 = 0;
+	/**
+	 * @noimplement
+	 */
+	private static char[] f3 = {};
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test18.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test18.java
new file mode 100644
index 0000000000..7c049ef395
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test18.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noimplement tag on fields in an inner class
+ */
+public class test18 {
+	
+	static class inner {
+		/**
+		 * @noimplement
+		 */
+		public Object f1 = null;
+		/**
+		 * @noimplement
+		 */
+		protected int f2 = 0;
+		/**
+		 * @noimplement
+		 */
+		private static char[] f3 = {};
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test19.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test19.java
new file mode 100644
index 0000000000..2ade9caf81
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test19.java
@@ -0,0 +1,72 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noimplement tag on fields in inner / outer classes
+ */
+public class test19 {
+	/**
+	 * @noimplement
+	 */
+	public Object f1 = null;
+	/**
+	 * @noimplement
+	 */
+	protected int f2 = 0;
+	/**
+	 * @noimplement
+	 */
+	private char[] f3 = {};
+	static class inner {
+		/**
+		 * @noimplement
+		 */
+		public static Object f1 = null;
+		/**
+		 * @noimplement
+		 */
+		protected int f2 = 0;
+		/**
+		 * @noimplement
+		 */
+		private static char[] f3 = {};
+		class inner2 {
+			/**
+			 * @noimplement
+			 */
+			public Object f1 = null;
+			/**
+			 * @noimplement
+			 */
+			protected int f2 = 0;
+			/**
+			 * @noimplement
+			 */
+			private char[] f3 = {};
+		}
+	}
+}
+
+class outer {
+	/**
+	 * @noimplement
+	 */
+	public Object f1 = null;
+	/**
+	 * @noimplement
+	 */
+	protected int f2 = 0;
+	/**
+	 * @noimplement
+	 */
+	private static char[] f3 = {};
+}
\ No newline at end of file
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test2.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test2.java
new file mode 100644
index 0000000000..34dc1f72ae
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test2.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noreference tag on final fields in an outer class
+ */
+public class test2 {
+
+}
+
+class outer {
+	/**
+	 * @noreference
+	 */
+	public final Object f1 = null;
+	/**
+	 * @noreference
+	 */
+	protected final int f2 = 0;
+	/**
+	 * @noreference
+	 */
+	private final char[] f3 = {};
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test20.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test20.java
new file mode 100644
index 0000000000..2811b0d30a
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test20.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test unsupported @noimplement tag on fields in a class in the default package
+ */
+public class test20 {
+	/**
+	 * @noimplement
+	 */
+	public Object f1 = null;
+	/**
+	 * @noimplement
+	 */
+	protected int f2 = 0;
+	/**
+	 * @noimplement
+	 */
+	private static char[] f3 = {};
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test21.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test21.java
new file mode 100644
index 0000000000..c44e83d559
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test21.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @nooverride tag on fields in a class
+ */
+public class test21 {
+	/**
+	 * @nooverride
+	 */
+	public Object f1 = null;
+	/**
+	 * @nooverride
+	 */
+	protected int f2 = 0;
+	/**
+	 * @nooverride
+	 */
+	private static char[] f3 = {};
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test22.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test22.java
new file mode 100644
index 0000000000..90437bca83
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test22.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @nooverride tag on fields in an outer class
+ */
+public class test22 {
+
+}
+
+class outer {
+	/**
+	 * @nooverride
+	 */
+	public Object f1 = null;
+	/**
+	 * @nooverride
+	 */
+	protected int f2 = 0;
+	/**
+	 * @nooverride
+	 */
+	private static char[] f3 = {};
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test23.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test23.java
new file mode 100644
index 0000000000..fcbfb09712
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test23.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @nooverride tag on fields in an inner class
+ */
+public class test23 {
+	
+	static class inner {
+		/**
+		 * @nooverride
+		 */
+		public Object f1 = null;
+		/**
+		 * @nooverride
+		 */
+		protected int f2 = 0;
+		/**
+		 * @nooverride
+		 */
+		private static char[] f3 = {};
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test24.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test24.java
new file mode 100644
index 0000000000..cab3adf4ee
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test24.java
@@ -0,0 +1,72 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @nooverride tag on fields in inner / outer classes
+ */
+public class test24 {
+	/**
+	 * @nooverride
+	 */
+	public Object f1 = null;
+	/**
+	 * @nooverride
+	 */
+	protected int f2 = 0;
+	/**
+	 * @nooverride
+	 */
+	private char[] f3 = {};
+	static class inner {
+		/**
+		 * @nooverride
+		 */
+		public static Object f1 = null;
+		/**
+		 * @nooverride
+		 */
+		protected int f2 = 0;
+		/**
+		 * @nooverride
+		 */
+		private static char[] f3 = {};
+		class inner2 {
+			/**
+			 * @nooverride
+			 */
+			public Object f1 = null;
+			/**
+			 * @nooverride
+			 */
+			protected int f2 = 0;
+			/**
+			 * @nooverride
+			 */
+			private char[] f3 = {};
+		}
+	}
+}
+
+class outer {
+	/**
+	 * @nooverride
+	 */
+	public Object f1 = null;
+	/**
+	 * @nooverride
+	 */
+	protected int f2 = 0;
+	/**
+	 * @nooverride
+	 */
+	private static char[] f3 = {};
+}
\ No newline at end of file
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test25.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test25.java
new file mode 100644
index 0000000000..743faa108c
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test25.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test unsupported @nooverride tag on fields in a class in the default package
+ */
+public class test25 {
+	/**
+	 * @nooverride
+	 */
+	public Object f1 = null;
+	/**
+	 * @nooverride
+	 */
+	protected int f2 = 0;
+	/**
+	 * @nooverride
+	 */
+	private static char[] f3 = {};
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test26.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test26.java
new file mode 100644
index 0000000000..e6e7630424
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test26.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noinstantiate tag on fields in a class
+ */
+public class test26 {
+	/**
+	 * @noinstantiate
+	 */
+	public Object f1 = null;
+	/**
+	 * @noinstantiate
+	 */
+	protected int f2 = 0;
+	/**
+	 * @noinstantiate
+	 */
+	private static char[] f3 = {};
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test27.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test27.java
new file mode 100644
index 0000000000..741f0e571e
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test27.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noinstantiate tag on fields in an outer class
+ */
+public class test27 {
+
+}
+
+class outer {
+	/**
+	 * @noinstantiate
+	 */
+	public Object f1 = null;
+	/**
+	 * @noinstantiate
+	 */
+	protected int f2 = 0;
+	/**
+	 * @noinstantiate
+	 */
+	private static char[] f3 = {};
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test28.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test28.java
new file mode 100644
index 0000000000..4d14710263
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test28.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noinstantiate tag on fields in an inner class
+ */
+public class test28 {
+	
+	static class inner {
+		/**
+		 * @noinstantiate
+		 */
+		public Object f1 = null;
+		/**
+		 * @noinstantiate
+		 */
+		protected int f2 = 0;
+		/**
+		 * @noinstantiate
+		 */
+		private static char[] f3 = {};
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test29.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test29.java
new file mode 100644
index 0000000000..83a84ea49c
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test29.java
@@ -0,0 +1,72 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noinstantiate tag on fields in inner / outer classes
+ */
+public class test29 {
+	/**
+	 * @noinstantiate
+	 */
+	public Object f1 = null;
+	/**
+	 * @noinstantiate
+	 */
+	protected int f2 = 0;
+	/**
+	 * @noinstantiate
+	 */
+	private char[] f3 = {};
+	static class inner {
+		/**
+		 * @noinstantiate
+		 */
+		public static Object f1 = null;
+		/**
+		 * @noinstantiate
+		 */
+		protected int f2 = 0;
+		/**
+		 * @noinstantiate
+		 */
+		private static char[] f3 = {};
+		class inner2 {
+			/**
+			 * @noinstantiate
+			 */
+			public Object f1 = null;
+			/**
+			 * @noinstantiate
+			 */
+			protected int f2 = 0;
+			/**
+			 * @noinstantiate
+			 */
+			private char[] f3 = {};
+		}
+	}
+}
+
+class outer {
+	/**
+	 * @noinstantiate
+	 */
+	public Object f1 = null;
+	/**
+	 * @noinstantiate
+	 */
+	protected int f2 = 0;
+	/**
+	 * @noinstantiate
+	 */
+	private static char[] f3 = {};
+}
\ No newline at end of file
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test3.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test3.java
new file mode 100644
index 0000000000..65e3eeb404
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test3.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noreference tag on final fields in an inner class
+ */
+public class test3 {
+	
+	class inner {
+		/**
+		 * @noreference
+		 */
+		public final Object f1 = null;
+		/**
+		 * @noreference
+		 */
+		protected final int f2 = 0;
+		/**
+		 * @noreference
+		 */
+		private final char[] f3 = {};
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test30.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test30.java
new file mode 100644
index 0000000000..026273944e
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test30.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test unsupported @noinstantiate tag on fields in a class in the default package
+ */
+public class test30 {
+	/**
+	 * @noinstantiate
+	 */
+	public Object f1 = null;
+	/**
+	 * @noinstantiate
+	 */
+	protected int f2 = 0;
+	/**
+	 * @noinstantiate
+	 */
+	private static char[] f3 = {};
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test4.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test4.java
new file mode 100644
index 0000000000..20f96a23b0
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test4.java
@@ -0,0 +1,72 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noreference tag on final fields in inner / outer classes
+ */
+public class test4 {
+	/**
+	 * @noreference
+	 */
+	public final Object f1 = null;
+	/**
+	 * @noreference
+	 */
+	protected final int f2 = 0;
+	/**
+	 * @noreference
+	 */
+	private final char[] f3 = {};
+	static class inner {
+		/**
+		 * @noreference
+		 */
+		public final Object f1 = null;
+		/**
+		 * @noreference
+		 */
+		protected final int f2 = 0;
+		/**
+		 * @noreference
+		 */
+		private final char[] f3 = {};
+		class inner2 {
+			/**
+			 * @noreference
+			 */
+			public final Object f1 = null;
+			/**
+			 * @noreference
+			 */
+			protected final int f2 = 0;
+			/**
+			 * @noreference
+			 */
+			private final char[] f3 = {};
+		}
+	}
+}
+
+class outer {
+	/**
+	 * @noreference
+	 */
+	public final Object f1 = null;
+	/**
+	 * @noreference
+	 */
+	protected final int f2 = 0;
+	/**
+	 * @noreference
+	 */
+	private final char[] f3 = {};
+}
\ No newline at end of file
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test5.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test5.java
new file mode 100644
index 0000000000..27de1fc6f9
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test5.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test unsupported @noreference tag on final fields in a class in the default package
+ */
+public class test5 {
+	/**
+	 * @noreference
+	 */
+	public final Object f1 = null;
+	/**
+	 * @noreference
+	 */
+	protected final int f2 = 0;
+	/**
+	 * @noreference
+	 */
+	private final char[] f3 = {};
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test6.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test6.java
new file mode 100644
index 0000000000..5c128a7a5b
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test6.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noreference tag on static final fields in a class
+ */
+public class test6 {
+	/**
+	 * @noreference
+	 */
+	public static final Object f1 = null;
+	/**
+	 * @noreference
+	 */
+	protected static final int f2 = 0;
+	/**
+	 * @noreference
+	 */
+	private static final char[] f3 = {};
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test7.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test7.java
new file mode 100644
index 0000000000..4eb6afa52c
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test7.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noreference tag on static final fields in an outer class
+ */
+public class test7 {
+
+}
+
+class outer {
+	/**
+	 * @noreference
+	 */
+	public static final Object f1 = null;
+	/**
+	 * @noreference
+	 */
+	protected static final int f2 = 0;
+	/**
+	 * @noreference
+	 */
+	private static final char[] f3 = {};
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test8.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test8.java
new file mode 100644
index 0000000000..1ee783d096
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test8.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noreference tag on static final fields in an inner class
+ */
+public class test8 {
+	
+	static class inner {
+		/**
+		 * @noreference
+		 */
+		public static final Object f1 = null;
+		/**
+		 * @noreference
+		 */
+		protected static final int f2 = 0;
+		/**
+		 * @noreference
+		 */
+		private static final char[] f3 = {};
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test9.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test9.java
new file mode 100644
index 0000000000..0469525359
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/class/test9.java
@@ -0,0 +1,72 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test supported @noreference tag on static final fields in inner / outer classes
+ */
+public class test9 {
+	/**
+	 * @noreference
+	 */
+	public static final Object f1 = null;
+	/**
+	 * @noreference
+	 */
+	protected static final int f2 = 0;
+	/**
+	 * @noreference
+	 */
+	private static final char[] f3 = {};
+	static class inner {
+		/**
+		 * @noreference
+		 */
+		public static final Object f1 = null;
+		/**
+		 * @noreference
+		 */
+		protected static final int f2 = 0;
+		/**
+		 * @noreference
+		 */
+		private static final char[] f3 = {};
+		static class inner2 {
+			/**
+			 * @noreference
+			 */
+			public static final Object f1 = null;
+			/**
+			 * @noreference
+			 */
+			protected static final int f2 = 0;
+			/**
+			 * @noreference
+			 */
+			private static final char[] f3 = {};
+		}
+	}
+}
+
+class outer {
+	/**
+	 * @noreference
+	 */
+	public static final Object f1 = null;
+	/**
+	 * @noreference
+	 */
+	protected static final int f2 = 0;
+	/**
+	 * @noreference
+	 */
+	private static final char[] f3 = {};
+}
\ No newline at end of file
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test1.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test1.java
new file mode 100644
index 0000000000..99553a83e4
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test1.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noreference tag on fields in a enum
+ */
+public enum test1 {
+	
+	A;
+	
+	/**
+	 * @noreference
+	 */
+	public final Object f1 = null;
+	/**
+	 * @noreference
+	 */
+	protected final int f2 = 0;
+	/**
+	 * @noreference
+	 */
+	private final char[] f3 = {};
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test10.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test10.java
new file mode 100644
index 0000000000..73a1f6ae37
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test10.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test unsupported @noreference tag on static final fields in an enum in the default package
+ */
+public enum test10 {
+	
+	A;
+	
+	/**
+	 * @noreference
+	 */
+	public static final Object f1 = null;
+	/**
+	 * @noreference
+	 */
+	protected static final int f2 = 0;
+	/**
+	 * @noreference
+	 */
+	private static final char[] f3 = {};
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test11.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test11.java
new file mode 100644
index 0000000000..9d07a2a721
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test11.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noextend tag on fields in a enum
+ */
+public enum test11 {
+	
+	A;
+	
+	/**
+	 * @noextend
+	 */
+	public Object f1 = null;
+	/**
+	 * @noextend
+	 */
+	protected int f2 = 0;
+	/**
+	 * @noextend
+	 */
+	private static char[] f3 = {};
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test12.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test12.java
new file mode 100644
index 0000000000..9ded19ccb5
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test12.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noextend tag on fields in an outer enum
+ */
+public enum test12 {
+
+	A;
+	
+}
+
+enum outer {
+	
+	A;
+	
+	/**
+	 * @noextend
+	 */
+	public Object f1 = null;
+	/**
+	 * @noextend
+	 */
+	protected int f2 = 0;
+	/**
+	 * @noextend
+	 */
+	private static char[] f3 = {};
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test13.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test13.java
new file mode 100644
index 0000000000..90639aea56
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test13.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noextend tag on fields in an inner enum
+ */
+public enum test13 {
+	
+	A;
+	
+	static enum inner {
+		
+		A;
+		
+		/**
+		 * @noextend
+		 */
+		public Object f1 = null;
+		/**
+		 * @noextend
+		 */
+		protected int f2 = 0;
+		/**
+		 * @noextend
+		 */
+		private static char[] f3 = {};
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test14.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test14.java
new file mode 100644
index 0000000000..29bdcf0672
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test14.java
@@ -0,0 +1,84 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noextend tag on fields in inner / outer enums
+ */
+public enum test14 {
+	
+	A;
+	
+	/**
+	 * @noextend
+	 */
+	public Object f1 = null;
+	/**
+	 * @noextend
+	 */
+	protected int f2 = 0;
+	/**
+	 * @noextend
+	 */
+	private char[] f3 = {};
+	static enum inner {
+		
+		A;
+		
+		/**
+		 * @noextend
+		 */
+		public static Object f1 = null;
+		/**
+		 * @noextend
+		 */
+		protected int f2 = 0;
+		/**
+		 * @noextend
+		 */
+		private static char[] f3 = {};
+		enum inner2 {
+			
+			A;
+			
+			/**
+			 * @noextend
+			 */
+			public Object f1 = null;
+			/**
+			 * @noextend
+			 */
+			protected int f2 = 0;
+			/**
+			 * @noextend
+			 */
+			private char[] f3 = {};
+		}
+	}
+}
+
+enum outer {
+	
+	A;
+	
+	/**
+	 * @noextend
+	 */
+	public Object f1 = null;
+	/**
+	 * @noextend
+	 */
+	protected int f2 = 0;
+	/**
+	 * @noextend
+	 */
+	private static char[] f3 = {};
+}
\ No newline at end of file
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test15.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test15.java
new file mode 100644
index 0000000000..ef845675f2
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test15.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test unsupported @noextend tag on fields in a enum in the default package
+ */
+public enum test15 {
+	
+	A;
+	
+	/**
+	 * @noextend
+	 */
+	public Object f1 = null;
+	/**
+	 * @noextend
+	 */
+	protected int f2 = 0;
+	/**
+	 * @noextend
+	 */
+	private static char[] f3 = {};
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test16.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test16.java
new file mode 100644
index 0000000000..3a8a6dc5e9
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test16.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noimplement tag on fields in a enum
+ */
+public enum test16 {
+	
+	A;
+	
+	/**
+	 * @noimplement
+	 */
+	public Object f1 = null;
+	/**
+	 * @noimplement
+	 */
+	protected int f2 = 0;
+	/**
+	 * @noimplement
+	 */
+	private static char[] f3 = {};
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test17.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test17.java
new file mode 100644
index 0000000000..06fa808b5c
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test17.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noimplement tag on fields in an outer enum
+ */
+public enum test17 {
+
+}
+
+enum outer {
+	
+	A;
+	
+	/**
+	 * @noimplement
+	 */
+	public Object f1 = null;
+	/**
+	 * @noimplement
+	 */
+	protected int f2 = 0;
+	/**
+	 * @noimplement
+	 */
+	private static char[] f3 = {};
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test18.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test18.java
new file mode 100644
index 0000000000..29384fc42f
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test18.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noimplement tag on fields in an inner enum
+ */
+public enum test18 {
+	
+	A;
+	
+	static enum inner {
+		
+		A;
+		
+		/**
+		 * @noimplement
+		 */
+		public Object f1 = null;
+		/**
+		 * @noimplement
+		 */
+		protected int f2 = 0;
+		/**
+		 * @noimplement
+		 */
+		private static char[] f3 = {};
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test19.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test19.java
new file mode 100644
index 0000000000..6505d9c03e
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test19.java
@@ -0,0 +1,84 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noimplement tag on fields in inner / outer enums
+ */
+public enum test19 {
+	
+	A;
+	
+	/**
+	 * @noimplement
+	 */
+	public Object f1 = null;
+	/**
+	 * @noimplement
+	 */
+	protected int f2 = 0;
+	/**
+	 * @noimplement
+	 */
+	private char[] f3 = {};
+	static enum inner {
+		
+		A;
+		
+		/**
+		 * @noimplement
+		 */
+		public static Object f1 = null;
+		/**
+		 * @noimplement
+		 */
+		protected int f2 = 0;
+		/**
+		 * @noimplement
+		 */
+		private static char[] f3 = {};
+		enum inner2 {
+			
+			A;
+			
+			/**
+			 * @noimplement
+			 */
+			public Object f1 = null;
+			/**
+			 * @noimplement
+			 */
+			protected int f2 = 0;
+			/**
+			 * @noimplement
+			 */
+			private char[] f3 = {};
+		}
+	}
+}
+
+enum outer {
+	
+	A;
+	
+	/**
+	 * @noimplement
+	 */
+	public Object f1 = null;
+	/**
+	 * @noimplement
+	 */
+	protected int f2 = 0;
+	/**
+	 * @noimplement
+	 */
+	private static char[] f3 = {};
+}
\ No newline at end of file
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test2.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test2.java
new file mode 100644
index 0000000000..6f2094a585
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test2.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noreference tag on final fields in an outer enum
+ */
+public enum test2 {
+
+}
+
+enum outer {
+	
+	A;
+	
+	/**
+	 * @noreference
+	 */
+	public final Object f1 = null;
+	/**
+	 * @noreference
+	 */
+	protected final int f2 = 0;
+	/**
+	 * @noreference
+	 */
+	private final char[] f3 = {};
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test20.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test20.java
new file mode 100644
index 0000000000..6db6096fa2
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test20.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test unsupported @noimplement tag on fields in a enum in the default package
+ */
+public enum test20 {
+	
+	A;
+	
+	/**
+	 * @noimplement
+	 */
+	public Object f1 = null;
+	/**
+	 * @noimplement
+	 */
+	protected int f2 = 0;
+	/**
+	 * @noimplement
+	 */
+	private static char[] f3 = {};
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test21.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test21.java
new file mode 100644
index 0000000000..9eaf2f72e9
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test21.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @nooverride tag on fields in a enum
+ */
+public enum test21 {
+	
+	A;
+	
+	/**
+	 * @nooverride
+	 */
+	public Object f1 = null;
+	/**
+	 * @nooverride
+	 */
+	protected int f2 = 0;
+	/**
+	 * @nooverride
+	 */
+	private static char[] f3 = {};
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test22.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test22.java
new file mode 100644
index 0000000000..cf3beaf3ce
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test22.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @nooverride tag on fields in an outer enum
+ */
+public enum test22 {
+
+}
+
+enum outer {
+	
+	A;
+	
+	/**
+	 * @nooverride
+	 */
+	public Object f1 = null;
+	/**
+	 * @nooverride
+	 */
+	protected int f2 = 0;
+	/**
+	 * @nooverride
+	 */
+	private static char[] f3 = {};
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test23.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test23.java
new file mode 100644
index 0000000000..dfc7362c5e
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test23.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @nooverride tag on fields in an inner enum
+ */
+public enum test23 {
+	
+	A;
+	
+	static enum inner {
+		
+		A;
+		
+		/**
+		 * @nooverride
+		 */
+		public Object f1 = null;
+		/**
+		 * @nooverride
+		 */
+		protected int f2 = 0;
+		/**
+		 * @nooverride
+		 */
+		private static char[] f3 = {};
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test24.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test24.java
new file mode 100644
index 0000000000..6d1ef0e7ca
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test24.java
@@ -0,0 +1,84 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @nooverride tag on fields in inner / outer enums
+ */
+public enum test24 {
+	
+	A;
+	
+	/**
+	 * @nooverride
+	 */
+	public Object f1 = null;
+	/**
+	 * @nooverride
+	 */
+	protected int f2 = 0;
+	/**
+	 * @nooverride
+	 */
+	private char[] f3 = {};
+	static enum inner {
+		
+		A;
+		
+		/**
+		 * @nooverride
+		 */
+		public static Object f1 = null;
+		/**
+		 * @nooverride
+		 */
+		protected int f2 = 0;
+		/**
+		 * @nooverride
+		 */
+		private static char[] f3 = {};
+		enum inner2 {
+			
+			A;
+			
+			/**
+			 * @nooverride
+			 */
+			public Object f1 = null;
+			/**
+			 * @nooverride
+			 */
+			protected int f2 = 0;
+			/**
+			 * @nooverride
+			 */
+			private char[] f3 = {};
+		}
+	}
+}
+
+enum outer {
+	
+	A;
+	
+	/**
+	 * @nooverride
+	 */
+	public Object f1 = null;
+	/**
+	 * @nooverride
+	 */
+	protected int f2 = 0;
+	/**
+	 * @nooverride
+	 */
+	private static char[] f3 = {};
+}
\ No newline at end of file
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test25.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test25.java
new file mode 100644
index 0000000000..82c9afaa6f
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test25.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test unsupported @nooverride tag on fields in a enum in the default package
+ */
+public enum test25 {
+	
+	A;
+
+	/**
+	 * @nooverride
+	 */
+	public Object f1 = null;
+	/**
+	 * @nooverride
+	 */
+	protected int f2 = 0;
+	/**
+	 * @nooverride
+	 */
+	private static char[] f3 = {};
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test26.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test26.java
new file mode 100644
index 0000000000..91a10bd71b
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test26.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noinstantiate tag on fields in a enum
+ */
+public enum test26 {
+	
+	A;
+	
+	/**
+	 * @noinstantiate
+	 */
+	public Object f1 = null;
+	/**
+	 * @noinstantiate
+	 */
+	protected int f2 = 0;
+	/**
+	 * @noinstantiate
+	 */
+	private static char[] f3 = {};
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test27.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test27.java
new file mode 100644
index 0000000000..b4595649de
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test27.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noinstantiate tag on fields in an outer enum
+ */
+public enum test27 {
+
+}
+
+enum outer {
+	
+	A;
+	
+	/**
+	 * @noinstantiate
+	 */
+	public Object f1 = null;
+	/**
+	 * @noinstantiate
+	 */
+	protected int f2 = 0;
+	/**
+	 * @noinstantiate
+	 */
+	private static char[] f3 = {};
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test28.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test28.java
new file mode 100644
index 0000000000..1a779d8236
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test28.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noinstantiate tag on fields in an inner enum
+ */
+public enum test28 {
+	
+	A;
+	
+	static enum inner {
+		
+		A;
+		 
+		/**
+		 * @noinstantiate
+		 */
+		public Object f1 = null;
+		/**
+		 * @noinstantiate
+		 */
+		protected int f2 = 0;
+		/**
+		 * @noinstantiate
+		 */
+		private static char[] f3 = {};
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test29.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test29.java
new file mode 100644
index 0000000000..da3fd6eb1f
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test29.java
@@ -0,0 +1,84 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noinstantiate tag on fields in inner / outer enums
+ */
+public enum test29 {
+	
+	A;
+	
+	/**
+	 * @noinstantiate
+	 */
+	public Object f1 = null;
+	/**
+	 * @noinstantiate
+	 */
+	protected int f2 = 0;
+	/**
+	 * @noinstantiate
+	 */
+	private char[] f3 = {};
+	static enum inner {
+		
+		A;
+		
+		/**
+		 * @noinstantiate
+		 */
+		public static Object f1 = null;
+		/**
+		 * @noinstantiate
+		 */
+		protected int f2 = 0;
+		/**
+		 * @noinstantiate
+		 */
+		private static char[] f3 = {};
+		enum inner2 {
+			
+			A;
+			
+			/**
+			 * @noinstantiate
+			 */
+			public Object f1 = null;
+			/**
+			 * @noinstantiate
+			 */
+			protected int f2 = 0;
+			/**
+			 * @noinstantiate
+			 */
+			private char[] f3 = {};
+		}
+	}
+}
+
+enum outer {
+	
+	A;
+	
+	/**
+	 * @noinstantiate
+	 */
+	public Object f1 = null;
+	/**
+	 * @noinstantiate
+	 */
+	protected int f2 = 0;
+	/**
+	 * @noinstantiate
+	 */
+	private static char[] f3 = {};
+}
\ No newline at end of file
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test3.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test3.java
new file mode 100644
index 0000000000..77aa3497d6
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test3.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noreference tag on final fields in an inner enum
+ */
+public enum test3 {
+	
+	A;
+	
+	enum inner {
+		
+		A;
+		
+		/**
+		 * @noreference
+		 */
+		public final Object f1 = null;
+		/**
+		 * @noreference
+		 */
+		protected final int f2 = 0;
+		/**
+		 * @noreference
+		 */
+		private final char[] f3 = {};
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test30.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test30.java
new file mode 100644
index 0000000000..19c4318b65
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test30.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test unsupported @noinstantiate tag on fields in a enum in the default package
+ */
+public enum test30 {
+	
+	A;
+	
+	/**
+	 * @noinstantiate
+	 */
+	public Object f1 = null;
+	/**
+	 * @noinstantiate
+	 */
+	protected int f2 = 0;
+	/**
+	 * @noinstantiate
+	 */
+	private static char[] f3 = {};
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test31.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test31.java
new file mode 100644
index 0000000000..a15a494027
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test31.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noreference tag on an enum constant
+ */
+public enum test31 {
+	
+	/**
+	 * @noreference
+	 */
+	A;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test32.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test32.java
new file mode 100644
index 0000000000..8ed5133a61
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test32.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noreference tag on an enum constant
+ */
+public enum test32 {
+
+}
+
+enum outer {
+	
+	/**
+	 * @noreference
+	 */
+	A;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test33.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test33.java
new file mode 100644
index 0000000000..151b0b3b18
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test33.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noreference tag on an enum constant in an inner enum
+ */
+public enum test33 {
+	
+	A;
+	
+	enum inner {
+		
+		/**
+		 * @noreference
+		 */
+		A;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test34.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test34.java
new file mode 100644
index 0000000000..377406b4fc
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test34.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noreference tag on enum constants in inner / outer enums
+ */
+public enum test34 {
+	
+	/**
+	 * @noreference
+	 */
+	A;
+	static enum inner {
+		
+		/**
+		 * @noreference
+		 */
+		A;
+		enum inner2 {
+			
+			/**
+			 * @noreference
+			 */
+			A;
+		}
+	}
+}
+
+enum outer {
+	
+	/**
+	 * @noreference
+	 */
+	A;
+}
\ No newline at end of file
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test35.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test35.java
new file mode 100644
index 0000000000..1cfdff1671
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test35.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test unsupported @noreference tag on an enum constant in an enum in the default package
+ */
+public enum test35 {
+	
+	/**
+	 * @noreference
+	 */
+	A;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test36.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test36.java
new file mode 100644
index 0000000000..c4879033d5
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test36.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noextend tag on an enum constant
+ */
+public enum test36 {
+	
+	/**
+	 * @noextend
+	 */
+	A;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test37.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test37.java
new file mode 100644
index 0000000000..5d5cc6c481
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test37.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noextend tag on an enum constant
+ */
+public enum test37 {
+
+}
+
+enum outer {
+	
+	/**
+	 * @noextend
+	 */
+	A;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test38.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test38.java
new file mode 100644
index 0000000000..3e0f4d9f5e
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test38.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noextend tag on an enum constant in an inner enum
+ */
+public enum test38 {
+	
+	A;
+	
+	enum inner {
+		
+		/**
+		 * @noextend
+		 */
+		A;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test39.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test39.java
new file mode 100644
index 0000000000..694767fc71
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test39.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noextend tag on enum constants in inner / outer enums
+ */
+public enum test39 {
+	
+	/**
+	 * @noextend
+	 */
+	A;
+	static enum inner {
+		
+		/**
+		 * @noextend
+		 */
+		A;
+		enum inner2 {
+			
+			/**
+			 * @noextend
+			 */
+			A;
+		}
+	}
+}
+
+enum outer {
+	
+	/**
+	 * @noextend
+	 */
+	A;
+}
\ No newline at end of file
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test4.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test4.java
new file mode 100644
index 0000000000..2fff46afd3
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test4.java
@@ -0,0 +1,84 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noreference tag on final fields in inner / outer enums
+ */
+public enum test4 {
+	
+	A;
+	
+	/**
+	 * @noreference
+	 */
+	public final Object f1 = null;
+	/**
+	 * @noreference
+	 */
+	protected final int f2 = 0;
+	/**
+	 * @noreference
+	 */
+	public final char[] f3 = {};
+	static enum inner {
+		
+		A;
+		
+		/**
+		 * @noreference
+		 */
+		public final Object f1 = null;
+		/**
+		 * @noreference
+		 */
+		protected final int f2 = 0;
+		/**
+		 * @noreference
+		 */
+		private final char[] f3 = {};
+		enum inner2 {
+			
+			A;
+			
+			/**
+			 * @noreference
+			 */
+			public final Object f1 = null;
+			/**
+			 * @noreference
+			 */
+			protected final int f2 = 0;
+			/**
+			 * @noreference
+			 */
+			private final char[] f3 = {};
+		}
+	}
+}
+
+enum outer {
+	
+	A;
+	
+	/**
+	 * @noreference
+	 */
+	public final Object f1 = null;
+	/**
+	 * @noreference
+	 */
+	protected final int f2 = 0;
+	/**
+	 * @noreference
+	 */
+	private final char[] f3 = {};
+}
\ No newline at end of file
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test40.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test40.java
new file mode 100644
index 0000000000..dae017ff4b
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test40.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test unsupported @noextend tag on an enum constant in an enum in the default package
+ */
+public enum test40 {
+	
+	/**
+	 * @noextend
+	 */
+	A;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test41.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test41.java
new file mode 100644
index 0000000000..f9b8d47e0d
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test41.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noimplement tag on an enum constant
+ */
+public enum test41 {
+	
+	/**
+	 * @noimplement
+	 */
+	A;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test42.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test42.java
new file mode 100644
index 0000000000..9c8dad2102
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test42.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noimplement tag on an enum constant
+ */
+public enum test42 {
+
+}
+
+enum outer {
+	
+	/**
+	 * @noimplement
+	 */
+	A;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test43.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test43.java
new file mode 100644
index 0000000000..9300d732b5
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test43.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noimplement tag on an enum constant in an inner enum
+ */
+public enum test43 {
+	
+	A;
+	
+	enum inner {
+		
+		/**
+		 * @noimplement
+		 */
+		A;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test44.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test44.java
new file mode 100644
index 0000000000..7741b52465
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test44.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noimplement tag on enum constants in inner / outer enums
+ */
+public enum test44 {
+	
+	/**
+	 * @noimplement
+	 */
+	A;
+	static enum inner {
+		
+		/**
+		 * @noimplement
+		 */
+		A;
+		enum inner2 {
+			
+			/**
+			 * @noimplement
+			 */
+			A;
+		}
+	}
+}
+
+enum outer {
+	
+	/**
+	 * @noimplement
+	 */
+	A;
+}
\ No newline at end of file
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test45.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test45.java
new file mode 100644
index 0000000000..21032924e7
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test45.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test unsupported @noimplement tag on an enum constant in an enum in the default package
+ */
+public enum test45 {
+	
+	/**
+	 * @noimplement
+	 */
+	A;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test46.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test46.java
new file mode 100644
index 0000000000..16cfe4dd59
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test46.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @nooverride tag on an enum constant
+ */
+public enum test46 {
+	
+	/**
+	 * @nooverride
+	 */
+	A;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test47.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test47.java
new file mode 100644
index 0000000000..9cd5b3715e
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test47.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @nooverride tag on an enum constant
+ */
+public enum test47 {
+
+}
+
+enum outer {
+	
+	/**
+	 * @nooverride
+	 */
+	A;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test48.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test48.java
new file mode 100644
index 0000000000..1d133ff9fc
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test48.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @nooverride tag on an enum constant in an inner enum
+ */
+public enum test48 {
+	
+	A;
+	
+	enum inner {
+		
+		/**
+		 * @nooverride
+		 */
+		A;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test49.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test49.java
new file mode 100644
index 0000000000..781664e2ce
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test49.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @nooverride tag on enum constants in inner / outer enums
+ */
+public enum test49 {
+	
+	/**
+	 * @nooverride
+	 */
+	A;
+	static enum inner {
+		
+		/**
+		 * @nooverride
+		 */
+		A;
+		enum inner2 {
+			
+			/**
+			 * @nooverride
+			 */
+			A;
+		}
+	}
+}
+
+enum outer {
+	
+	/**
+	 * @nooverride
+	 */
+	A;
+}
\ No newline at end of file
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test5.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test5.java
new file mode 100644
index 0000000000..07b9706566
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test5.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test unsupported @noreference tag on final fields in an enum in the default package
+ */
+public enum test5 {
+	
+	A;
+	
+	/**
+	 * @noreference
+	 */
+	public final Object f1 = null;
+	/**
+	 * @noreference
+	 */
+	protected final int f2 = 0;
+	/**
+	 * @noreference
+	 */
+	private final char[] f3 = {};
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test50.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test50.java
new file mode 100644
index 0000000000..e49f24e2df
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test50.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test unsupported @nooverride tag on an enum constant in an enum in the default package
+ */
+public enum test50 {
+	
+	/**
+	 * @nooverride
+	 */
+	A;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test51.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test51.java
new file mode 100644
index 0000000000..0683e85ffb
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test51.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noinstantiate tag on an enum constant
+ */
+public enum test51 {
+	
+	/**
+	 * @noinstantiate
+	 */
+	A;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test52.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test52.java
new file mode 100644
index 0000000000..aa837ff02f
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test52.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noinstantiate tag on an enum constant
+ */
+public enum test52 {
+
+}
+
+enum outer {
+	
+	/**
+	 * @noinstantiate
+	 */
+	A;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test53.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test53.java
new file mode 100644
index 0000000000..2ad09eaf04
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test53.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noinstantiate tag on an enum constant in an inner enum
+ */
+public enum test53 {
+	
+	A;
+	
+	enum inner {
+		
+		/**
+		 * @noinstantiate
+		 */
+		A;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test54.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test54.java
new file mode 100644
index 0000000000..9862a1f8de
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test54.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noinstantiate tag on enum constants in inner / outer enums
+ */
+public enum test54 {
+	
+	/**
+	 * @noinstantiate
+	 */
+	A;
+	static enum inner {
+		
+		/**
+		 * @noinstantiate
+		 */
+		A;
+		enum inner2 {
+			
+			/**
+			 * @noinstantiate
+			 */
+			A;
+		}
+	}
+}
+
+enum outer {
+	
+	/**
+	 * @noinstantiate
+	 */
+	A;
+}
\ No newline at end of file
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test55.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test55.java
new file mode 100644
index 0000000000..57457fafad
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test55.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test unsupported @noinstantiate tag on an enum constant in an enum in the default package
+ */
+public enum test55 {
+	
+	/**
+	 * @noinstantiate
+	 */
+	A;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test56.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test56.java
new file mode 100644
index 0000000000..8d15f4fb1d
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test56.java
@@ -0,0 +1,56 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported tags on enum constants in inner / outer enums
+ */
+public enum test56 {
+	
+	/**
+	 * @noinstantiate
+	 * @noreference
+	 * @noextend
+	 * @noimplement
+	 */
+	A;
+	static enum inner {
+		
+		/**
+		 * @noinstantiate
+		 * @noreference
+		 * @noextend
+		 * @noimplement
+		 */
+		A;
+		enum inner2 {
+			
+			/**
+			 * @noinstantiate
+			 * @noreference
+			 * @noextend
+			 * @noimplement
+			 */
+			A;
+		}
+	}
+}
+
+enum outer {
+	
+	/**
+	 * @noinstantiate
+	 * @noreference
+	 * @noextend
+	 * @noimplement
+	 */
+	A;
+}
\ No newline at end of file
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test6.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test6.java
new file mode 100644
index 0000000000..c332e56ea4
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test6.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noreference tag on static final fields in an enum
+ */
+public enum test6 {
+	
+	A;
+	
+	/**
+	 * @noreference
+	 */
+	public static final Object f1 = null;
+	/**
+	 * @noreference
+	 */
+	protected static final int f2 = 0;
+	/**
+	 * @noreference
+	 */
+	private static final char[] f3 = {};
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test7.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test7.java
new file mode 100644
index 0000000000..ffb71d4eb2
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test7.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noreference tag on static final fields in an outer enum
+ */
+public enum test7 {
+
+	A;
+	
+}
+
+enum outer {
+	
+	A;
+	
+	/**
+	 * @noreference
+	 */
+	public static final Object f1 = null;
+	/**
+	 * @noreference
+	 */
+	protected static final int f2 = 0;
+	/**
+	 * @noreference
+	 */
+	private static final char[] f3 = {};
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test8.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test8.java
new file mode 100644
index 0000000000..063c49f287
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test8.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noreference tag on static final fields in an inner enum
+ */
+public enum test8 {
+	
+	A;
+	
+	static enum inner {
+		
+		A;
+		
+		/**
+		 * @noreference
+		 */
+		public static final Object f1 = null;
+		/**
+		 * @noreference
+		 */
+		protected static final int f2 = 0;
+		/**
+		 * @noreference
+		 */
+		private static final char[] f3 = {};
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test9.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test9.java
new file mode 100644
index 0000000000..0acde77938
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/enum/test9.java
@@ -0,0 +1,84 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test supported @noreference tag on static final fields in inner / outer enums
+ */
+public enum test9 {
+	
+	A;
+	
+	/**
+	 * @noreference
+	 */
+	public static final Object f1 = null;
+	/**
+	 * @noreference
+	 */
+	protected static final int f2 = 0;
+	/**
+	 * @noreference
+	 */
+	private static final char[] f3 = {};
+	static enum inner {
+		
+		A;
+		
+		/**
+		 * @noreference
+		 */
+		public static final Object f1 = null;
+		/**
+		 * @noreference
+		 */
+		protected static final int f2 = 0;
+		/**
+		 * @noreference
+		 */
+		private static final char[] f3 = {};
+		static enum inner2 {
+			
+			A;
+			
+			/**
+			 * @noreference
+			 */
+			public static final Object f1 = null;
+			/**
+			 * @noreference
+			 */
+			protected static final int f2 = 0;
+			/**
+			 * @noreference
+			 */
+			private static final char[] f3 = {};
+		}
+	}
+}
+
+enum outer {
+	
+	A;
+	
+	/**
+	 * @noreference
+	 */
+	public static final Object f1 = null;
+	/**
+	 * @noreference
+	 */
+	protected static final int f2 = 0;
+	/**
+	 * @noreference
+	 */
+	private static final char[] f3 = {};
+}
\ No newline at end of file
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test1.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test1.java
new file mode 100644
index 0000000000..eedfbc4901
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test1.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noextend tag on a field in an interface
+ */
+public interface test1 {
+	/**
+	 * @noextend
+	 */
+	public Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test10.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test10.java
new file mode 100644
index 0000000000..91a114e80d
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test10.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test unsupported @noinstantiate tag on a field in an interface in the default package
+ */
+public interface test10 {
+	/**
+	 * @noinstantiate
+	 */
+	public Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test11.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test11.java
new file mode 100644
index 0000000000..67e2c81499
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test11.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noimplement tag on a field in an interface
+ */
+public interface test11 {
+	/**
+	 * @noimplement
+	 */
+	public Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test12.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test12.java
new file mode 100644
index 0000000000..90a708c5fc
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test12.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noimplement tag on an outer interface field
+ */
+public interface test12 {
+	
+}
+
+interface outer {
+	/**
+	 * @noimplement
+	 */
+	public static Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test13.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test13.java
new file mode 100644
index 0000000000..a5adef69d1
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test13.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noimplement tag on a field in an inner interface
+ */
+public interface test13 {
+	interface inner {
+		/**
+		 * @noimplement
+		 */
+		public Object f1 = null;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test14.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test14.java
new file mode 100644
index 0000000000..db22f2ab62
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test14.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noimplement tag on fields in outer / inner interface
+ */
+public interface test14 {
+	interface inner {
+		/**
+		 * @noimplement
+		 */
+		public int f2 = 0;
+		interface inner2 {
+			/**
+			 * @noimplement
+			 */
+			public char[] f3 = {};
+		}
+	}
+}
+
+interface outer {
+	/**
+	 * @noimplement
+	 */
+	public static Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test15.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test15.java
new file mode 100644
index 0000000000..62a905c6d1
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test15.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test unsupported @noimplement tag on a field in an interface in the default package
+ */
+public interface test15 {
+	/**
+	 * @noimplement
+	 */
+	public Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test16.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test16.java
new file mode 100644
index 0000000000..1b47af1afa
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test16.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @nooverride tag on a field in an interface
+ */
+public interface test16 {
+	/**
+	 * @nooverride
+	 */
+	public Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test17.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test17.java
new file mode 100644
index 0000000000..c35698fe1e
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test17.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @nooverride tag on an outer interface field
+ */
+public interface test17 {
+	
+}
+
+interface outer {
+	/**
+	 * @nooverride
+	 */
+	public static Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test18.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test18.java
new file mode 100644
index 0000000000..23de5c8362
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test18.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @nooverride tag on a field in an inner interface
+ */
+public interface test18 {
+	interface inner {
+		/**
+		 * @nooverride
+		 */
+		public Object f1 = null;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test19.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test19.java
new file mode 100644
index 0000000000..2f4c2e01cf
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test19.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @nooverride tag on fields in outer / inner interface
+ */
+public interface test19 {
+	interface inner {
+		/**
+		 * @nooverride
+		 */
+		public int f2 = 0;
+		interface inner2 {
+			/**
+			 * @nooverride
+			 */
+			public char[] f3 = {};
+		}
+	}
+}
+
+interface outer {
+	/**
+	 * @nooverride
+	 */
+	public static Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test2.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test2.java
new file mode 100644
index 0000000000..65196fe94d
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test2.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noextend tag on an outer interface field
+ */
+public interface test2 {
+	
+}
+
+interface outer {
+	/**
+	 * @noextend
+	 */
+	public static Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test20.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test20.java
new file mode 100644
index 0000000000..1a4a29bb1b
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test20.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test unsupported @nooverride tag on a field in an interface in the default package
+ */
+public interface test20 {
+	/**
+	 * @nooverride
+	 */
+	public Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test21.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test21.java
new file mode 100644
index 0000000000..e916eda288
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test21.java
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported tags on fields in outer / inner interface
+ */
+public interface test21 {
+	interface inner {
+		/**
+		 * @nooverride
+		 * @noimplement
+		 * @noinstantiate
+		 * @noextend
+		 */
+		public int f2 = 0;
+		interface inner2 {
+			/**
+			 * @nooverride
+			 * @noimplement
+			 * @noinstantiate
+			 * @noextend
+			 */
+			public char[] f3 = {};
+		}
+	}
+}
+
+interface outer {
+	/**
+	 * @nooverride
+	 * @noimplement
+	 * @noinstantiate
+	 * @noextend
+	 */
+	public static Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test22.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test22.java
new file mode 100644
index 0000000000..a7293fb319
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test22.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noreference tag on a final field in an interface
+ */
+public interface test22 {
+	/**
+	 * @noreference
+	 */
+	public final Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test23.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test23.java
new file mode 100644
index 0000000000..7422635de6
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test23.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noreference tag on a final outer interface field
+ */
+public interface test23 {
+	
+}
+
+interface outer {
+	/**
+	 * @noreference
+	 */
+	public final Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test24.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test24.java
new file mode 100644
index 0000000000..53043d3ddb
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test24.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noreference tag on a final field in an inner interface
+ */
+public interface test24 {
+	interface inner {
+		/**
+		 * @noreference
+		 */
+		public final Object f1 = null;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test25.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test25.java
new file mode 100644
index 0000000000..635461bc02
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test25.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noreference tag on fields in outer / inner interface
+ */
+public interface test25 {
+	interface inner {
+		/**
+		 * @noreference
+		 */
+		public final int f2 = 0;
+		interface inner2 {
+			/**
+			 * @noreference
+			 */
+			public final char[] f3 = {};
+		}
+	}
+}
+
+interface outer {
+	/**
+	 * @noreference
+	 */
+	public final Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test26.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test26.java
new file mode 100644
index 0000000000..ecdbab7296
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test26.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test unsupported @noreference tag on a final field in an interface in the default package
+ */
+public interface test26 {
+	/**
+	 * @noreference
+	 */
+	public final Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test27.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test27.java
new file mode 100644
index 0000000000..561545fdbb
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test27.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noreference tag on a static final field in an interface
+ */
+public interface test27 {
+	/**
+	 * @noreference
+	 */
+	public static final Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test28.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test28.java
new file mode 100644
index 0000000000..9bd2d17df6
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test28.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noreference tag on a static final outer interface field
+ */
+public interface test28 {
+	
+}
+
+interface outer {
+	/**
+	 * @noreference
+	 */
+	public static final Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test29.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test29.java
new file mode 100644
index 0000000000..bef1be9e1c
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test29.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noreference tag on a static final field in an inner interface
+ */
+public interface test29 {
+	interface inner {
+		/**
+		 * @noreference
+		 */
+		public static final Object f1 = null;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test3.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test3.java
new file mode 100644
index 0000000000..0044f41d7c
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test3.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noextend tag on a field in an inner interface
+ */
+public interface test3 {
+	interface inner {
+		/**
+		 * @noextend
+		 */
+		public Object f1 = null;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test30.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test30.java
new file mode 100644
index 0000000000..d2b876273a
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test30.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noreference tag on fields in outer / inner interface
+ */
+public interface test30 {
+	interface inner {
+		/**
+		 * @noreference
+		 */
+		public final int f2 = 0;
+		interface inner2 {
+			/**
+			 * @noreference
+			 */
+			public final char[] f3 = {};
+		}
+	}
+}
+
+interface outer {
+	/**
+	 * @noreference
+	 */
+	public final Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test31.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test31.java
new file mode 100644
index 0000000000..96d88ecfe5
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test31.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test unsupported @noreference tag on a static final field in an interface in the default package
+ */
+public interface test31 {
+	/**
+	 * @noreference
+	 */
+	public static final Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test4.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test4.java
new file mode 100644
index 0000000000..59aa72309a
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test4.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noextend tag on fields in outer / inner interface
+ */
+public interface test4 {
+	interface inner {
+		/**
+		 * @noextend
+		 */
+		public int f2 = 0;
+		interface inner2 {
+			/**
+			 * @noextend
+			 */
+			public char[] f3 = {};
+		}
+	}
+}
+
+interface outer {
+	/**
+	 * @noextend
+	 */
+	public static Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test5.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test5.java
new file mode 100644
index 0000000000..98e4c8f9be
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test5.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test unsupported @noextend tag on a field in an interface in the default package
+ */
+public interface test5 {
+	/**
+	 * @noextend
+	 */
+	public Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test6.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test6.java
new file mode 100644
index 0000000000..fd85f1be5b
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test6.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noinstantiate tag on a field in an interface
+ */
+public interface test6 {
+	/**
+	 * @noinstantiate
+	 */
+	public Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test7.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test7.java
new file mode 100644
index 0000000000..8200a76bed
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test7.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noinstantiate tag on an outer interface field
+ */
+public interface test7 {
+	
+}
+
+interface outer {
+	/**
+	 * @noinstantiate
+	 */
+	public static Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test8.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test8.java
new file mode 100644
index 0000000000..65bad2b546
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test8.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noinstantiate tag on a field in an inner interface
+ */
+public interface test8 {
+	interface inner {
+		/**
+		 * @noinstantiate
+		 */
+		public Object f1 = null;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test9.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test9.java
new file mode 100644
index 0000000000..3feadb165d
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/interface/test9.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noinstantiate tag on fields in outer / inner interface
+ */
+public interface test9 {
+	interface inner {
+		/**
+		 * @noinstantiate
+		 */
+		public int f2 = 0;
+		interface inner2 {
+			/**
+			 * @noinstantiate
+			 */
+			public char[] f3 = {};
+		}
+	}
+}
+
+interface outer {
+	/**
+	 * @noinstantiate
+	 */
+	public static Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/class/test1.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/class/test1.java
new file mode 100644
index 0000000000..951d536819
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/class/test1.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test supported @noreference tag on fields in a class
+ */
+public class test1 {
+	/**
+	 * @noreference
+	 */
+	public Object f1;
+	/**
+	 * @noreference
+	 */
+	protected int f2;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/class/test2.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/class/test2.java
new file mode 100644
index 0000000000..cfd665a89f
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/class/test2.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test supported @noreference tag on static fields in a class
+ */
+public class test2 {
+	/**
+	 * @noreference
+	 */
+	public static Object f1;
+	/**
+	 * @noreference
+	 */
+	protected static int f2;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/class/test3.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/class/test3.java
new file mode 100644
index 0000000000..84e4ab19b8
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/class/test3.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test supported @noreference tag on fields in an outer class
+ */
+public class test3 {
+	
+}
+
+class outer {
+	/**
+	 * @noreference
+	 */
+	public Object f1;
+	/**
+	 * @noreference
+	 */
+	protected int f2;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/class/test4.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/class/test4.java
new file mode 100644
index 0000000000..3abe238660
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/class/test4.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test supported @noreference tag on fields in an outer class
+ */
+public class test4 {
+	
+}
+
+class outer {
+	/**
+	 * @noreference
+	 */
+	public static Object f1;
+	/**
+	 * @noreference
+	 */
+	protected static int f2;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/class/test5.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/class/test5.java
new file mode 100644
index 0000000000..d81acc4bd3
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/class/test5.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test supported @noreference tag on fields in a class
+ */
+public class test5 {
+	
+	class inner {
+		/**
+		 * @noreference
+		 */
+		public Object f1;
+		/**
+		 * @noreference
+		 */
+		protected int f2;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/class/test6.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/class/test6.java
new file mode 100644
index 0000000000..111b210b80
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/class/test6.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test supported @noreference tag on fields in a class
+ */
+public class test6 {
+	
+	static class inner {
+		/**
+		 * @noreference
+		 */
+		public static Object f1;
+		/**
+		 * @noreference
+		 */
+		protected static int f2;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/class/test7.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/class/test7.java
new file mode 100644
index 0000000000..02b93a89ee
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/class/test7.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test supported @noreference tag on static final fields in a class
+ */
+public class test7 {
+	static class inner {
+		/**
+		 * @noreference
+		 */
+		public static Object f1 = null;
+		/**
+		 * @noreference
+		 */
+		protected static int f2 = 0;
+		
+		class inner2 {
+		}
+	}
+}
+
+class outer {
+	/**
+	 * @noreference
+	 */
+	public static Object f1 = null;
+}
\ No newline at end of file
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/class/test8.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/class/test8.java
new file mode 100644
index 0000000000..7442b61072
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/class/test8.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+
+/**
+ * Test supported @noreference tag on fields in a class in the default package
+ */
+public class test8 {
+	/**
+	 * @noreference
+	 */
+	public Object f1;
+	/**
+	 * @noreference
+	 */
+	protected int f2;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/enum/test1.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/enum/test1.java
new file mode 100644
index 0000000000..cd54c91514
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/enum/test1.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests valid enum field tag use
+ * 
+ * @since 3.4
+ */
+public enum test1 {
+	
+	A,
+	B;
+	
+	/**
+	 * @noreference This enum field is not intended to be referenced by clients.
+	 */
+	public Object f1 = null;
+	/**
+	 * @noreference This enum field is not intended to be referenced by clients.
+	 */
+	protected int f2 = 0;
+	/**
+	 * @noreference This enum field is not intended to be referenced by clients.
+	 */
+	protected static char g = 'd';
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/enum/test2.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/enum/test2.java
new file mode 100644
index 0000000000..e4cf289848
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/enum/test2.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests valid field tags on an outer enum
+ * 
+ * @since 3.4
+ */
+public enum test2 {
+
+}
+
+enum outer {
+	A,
+	B;
+	
+	/**
+	 * @noreference This enum field is not intended to be referenced by clients.
+	 */
+	public Object f1 = null;
+	/**
+	 * @noreference This enum field is not intended to be referenced by clients.
+	 */
+	protected int f2 = 0;
+	/**
+	 * @noreference This enum field is not intended to be referenced by clients.
+	 */
+	protected static char g = 'd';
+}
\ No newline at end of file
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/enum/test3.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/enum/test3.java
new file mode 100644
index 0000000000..ed73f01957
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/enum/test3.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Tests the valid use of field tags on an enum in the default package
+ * 
+ * @since 3.4
+ */
+public enum test3 {
+	A,
+	B;
+	
+	/**
+	 * @noreference This enum field is not intended to be referenced by clients.
+	 */
+	public Object f1 = null;
+	/**
+	 * @noreference This enum field is not intended to be referenced by clients.
+	 */
+	protected int f2 = 0;
+	/**
+	 * @noreference This enum field is not intended to be referenced by clients.
+	 */
+	protected static char g = 'd';
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/enum/test4.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/enum/test4.java
new file mode 100644
index 0000000000..90c83d9372
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/enum/test4.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests the valid use of @noreference field tags on an inner enum
+ * 
+ * @since 3.4
+ */
+public enum test4 {
+	
+	enum inner {
+		A,
+		B;
+		
+		/**
+		 * @noreference This enum field is not intended to be referenced by clients.
+		 */
+		public Object f1 = null;
+		/**
+		 * @noreference This enum field is not intended to be referenced by clients.
+		 */
+		protected int f2 = 0;
+		/**
+		 * @noreference This enum field is not intended to be referenced by clients.
+		 */
+		protected static char g = 'd';
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/enum/test5.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/enum/test5.java
new file mode 100644
index 0000000000..c6c74ad817
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/enum/test5.java
@@ -0,0 +1,71 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests the valid use of @noreference field tags on inner / outer enums
+ * 
+ * @since 3.4
+ */
+public enum test4 {
+	
+	A,
+	B;
+	
+	/**
+	 * @noreference This enum field is not intended to be referenced by clients.
+	 */
+	public Object f1 = null;
+	/**
+	 * @noreference This enum field is not intended to be referenced by clients.
+	 */
+	protected int f2 = 0;
+	/**
+	 * @noreference This enum field is not intended to be referenced by clients.
+	 */
+	protected static char g = 'd';
+	
+	enum inner {
+		A,
+		B;
+		
+		/**
+		 * @noreference This enum field is not intended to be referenced by clients.
+		 */
+		public Object f1 = null;
+		/**
+		 * @noreference This enum field is not intended to be referenced by clients.
+		 */
+		protected int f2 = 0;
+		/**
+		 * @noreference This enum field is not intended to be referenced by clients.
+		 */
+		protected static char g = 'd';
+	}
+}
+
+enum outer {
+	A,
+	B;
+	
+	/**
+	 * @noreference This enum field is not intended to be referenced by clients.
+	 */
+	public Object f1 = null;
+	/**
+	 * @noreference This enum field is not intended to be referenced by clients.
+	 */
+	protected int f2 = 0;
+	/**
+	 * @noreference This enum field is not intended to be referenced by clients.
+	 */
+	protected static char g = 'd';
+}
\ No newline at end of file
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/interface/test1.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/interface/test1.java
new file mode 100644
index 0000000000..83b217d1bd
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/interface/test1.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test supported @noreference tag on a field in an interface
+ */
+public interface test1 {
+	/**
+	 * @noreference
+	 */
+	public Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/interface/test2.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/interface/test2.java
new file mode 100644
index 0000000000..86a8a9a067
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/interface/test2.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test supported @noreference tag on an outer interface field
+ */
+public interface test2 {
+	
+}
+
+interface outer {
+	/**
+	 * @noreference
+	 */
+	public static Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/interface/test3.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/interface/test3.java
new file mode 100644
index 0000000000..1353d63930
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/interface/test3.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test supported @noreference tag on a field in an inner interface
+ */
+public interface test3 {
+	interface inner {
+		/**
+		 * @noreference
+		 */
+		public Object f1 = null;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/interface/test4.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/interface/test4.java
new file mode 100644
index 0000000000..6a1a048c28
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/field/valid/interface/test4.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test supported @noreference tag on fields in an outer interface
+ */
+public interface test4 {
+	interface inner {
+		/**
+		 * @noreference
+		 */
+		public int f2 = 0;
+		interface inner2 {
+			/**
+			 * @noreference
+			 */
+			public char[] f3 = {};
+		}
+	}
+}
+
+interface outer {
+	/**
+	 * @noreference
+	 */
+	public static Object f1 = null;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test1.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test1.java
new file mode 100644
index 0000000000..f810eb1489
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test1.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noreference tag on an interface
+ * @noreference
+ */
+public interface test1 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test10.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test10.java
new file mode 100644
index 0000000000..ae6f9eda58
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test10.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+
+/**
+ * Test unsupported @noextend tag on an interface in the default package
+ * @noextend
+ */
+public interface test10 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test11.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test11.java
new file mode 100644
index 0000000000..6969287a3f
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test11.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @nooverride tag on an interface
+ * @nooverride
+ */
+public interface test11 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test12.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test12.java
new file mode 100644
index 0000000000..33aaa984fe
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test12.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid @nooverride tag on an outer interface
+ */
+public interface test12 {
+
+}
+
+/**
+ * @nooverride
+ */
+interface outer {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test13.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test13.java
new file mode 100644
index 0000000000..fca1f25edf
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test13.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests an invalid @nooverride tag on a member interface
+ */
+public interface test13 {
+
+	/**
+	 * @nooverride
+	 */
+	interface inner {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test14.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test14.java
new file mode 100644
index 0000000000..ac6b4fe0f1
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test14.java
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid @nooverride tags on nested inner interfaces
+ * @nooverride
+ */
+public interface test14 {
+
+	/**
+	 * @nooverride
+	 */
+	interface inner {
+		
+	}
+	
+	interface inner1 {
+		/**
+		 * @nooverride
+		 */
+		interface inner2 {
+			
+		}
+	}
+	
+	interface inner2 {
+		
+	}
+}
+
+interface outer {
+	
+	/**
+	 * @nooverride
+	 */
+	interface inner {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test15.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test15.java
new file mode 100644
index 0000000000..fdc2ca83db
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test15.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+
+/**
+ * Test unsupported @nooverride tag on an interface
+ * @nooverride
+ */
+public interface test15 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test16.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test16.java
new file mode 100644
index 0000000000..0f1457f6e5
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test16.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported tags on an interface
+ * @noreference
+ * @nooverride
+ * @noextend
+ * @noinstantiate
+ */
+public interface test16 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test17.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test17.java
new file mode 100644
index 0000000000..c1e208c8e4
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test17.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid tags on an outer interface
+ */
+public interface test17 {
+
+}
+
+/**
+ * @noreference
+ * @nooverride
+ * @noextend
+ * @noinstantiate
+ */
+interface outer {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test18.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test18.java
new file mode 100644
index 0000000000..93a08091db
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test18.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid tags on a member interface
+ */
+public interface test18 {
+
+	/**
+	 * @noreference
+	 * @nooverride
+	 * @noextend
+	 * @noinstantiate
+	 */
+	interface inner {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test19.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test19.java
new file mode 100644
index 0000000000..1d36e0508b
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test19.java
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid tags on nested inner interfaces
+ * @noreference
+ * @nooverride
+ * @noextend
+ * @noinstantiate
+ */
+public interface test19 {
+
+	/**
+	 * @noreference
+	 * @nooverride
+	 * @noextend
+	 * @noinstantiate
+	 */
+	interface inner {
+		
+	}
+	
+	interface inner1 {
+		/**
+		 * @noreference
+		 * @nooverride
+		 * @noextend
+		 * @noinstantiate
+		 */
+		interface inner2 {
+			
+		}
+	}
+	
+	interface inner2 {
+		
+	}
+}
+
+interface outer {
+	
+	/**
+	 * @noreference
+	 * @nooverride
+	 * @noextend
+	 * @noinstantiate
+	 */
+	interface inner {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test2.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test2.java
new file mode 100644
index 0000000000..463ea8dc48
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test2.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid @noreference tag on outer interface
+ */
+public interface test2 {
+
+}
+
+/**
+ * @noreference
+ */
+interface outer {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test20.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test20.java
new file mode 100644
index 0000000000..c26dbe53f8
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test20.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+
+/**
+ * Test unsupported @noreference tag on an interface in the default package
+ * @noreference
+ * @nooverride
+ * @noextend
+ * @noinstantiate
+ */
+public interface test20 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test21.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test21.java
new file mode 100644
index 0000000000..c9461a9530
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test21.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noinstantiate tag on an interface
+ * @noinstantiate
+ */
+public interface test21 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test22.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test22.java
new file mode 100644
index 0000000000..6382dc4cac
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test22.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid @noinstantiate tag on outer interface
+ */
+public interface test22 {
+
+}
+
+/**
+ * @noinstantiate
+ */
+interface outer {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test23.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test23.java
new file mode 100644
index 0000000000..e166a27410
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test23.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests an invalid @noinstantiate tag on a member interface
+ */
+public interface test23 {
+
+	/**
+	 * @noinstantiate
+	 */
+	interface inner {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test24.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test24.java
new file mode 100644
index 0000000000..b4ee2accdd
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test24.java
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid @noinstantiate tags on nested inner interfaces
+ * @noinstantiate
+ */
+public interface test24 {
+
+	/**
+	 * @noinstantiate
+	 */
+	interface inner {
+		
+	}
+	
+	interface inner1 {
+		/**
+		 * @noinstantiate
+		 */
+		interface inner2 {
+			
+		}
+	}
+	
+	interface inner2 {
+		
+	}
+}
+
+interface outer {
+	
+	/**
+	 * @noinstantiate
+	 */
+	interface inner {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test25.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test25.java
new file mode 100644
index 0000000000..fb3badf0f5
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test25.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+
+/**
+ * Test unsupported @noinstantiate tag on an interface in the default package
+ * @noinstantiate
+ */
+public interface test25 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test3.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test3.java
new file mode 100644
index 0000000000..9b1cf5f680
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test3.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests an invalid @noreference tag on a member interface
+ */
+public interface test3 {
+
+	/**
+	 * @noreference
+	 */
+	interface inner {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test4.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test4.java
new file mode 100644
index 0000000000..1da4772afa
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test4.java
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid @noreference tags on nested inner interfaces
+ * @noreference
+ */
+public interface test4 {
+
+	/**
+	 * @noreference
+	 */
+	interface inner {
+		
+	}
+	
+	interface inner1 {
+		/**
+		 * @noreference
+		 */
+		interface inner2 {
+			
+		}
+	}
+	
+	interface inner2 {
+		
+	}
+}
+
+interface outer {
+	
+	/**
+	 * @noreference
+	 */
+	interface InnerNoRef4 {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test5.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test5.java
new file mode 100644
index 0000000000..791a738f4d
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test5.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+
+/**
+ * Test unsupported @noreference tag on an interface in the default package
+ * @noreference
+ */
+public interface test5 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test6.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test6.java
new file mode 100644
index 0000000000..a3a1c23207
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test6.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noextend tag on an interface
+ * @noextend
+ */
+public interface test6 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test7.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test7.java
new file mode 100644
index 0000000000..4fd13f34e1
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test7.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid @noextend tag on an outer interface
+ */
+public interface test7 {
+
+}
+
+/**
+ * @noextend
+ */
+interface outer {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test8.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test8.java
new file mode 100644
index 0000000000..7ab9a9549c
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test8.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests an invalid @noextend tag on a member interface
+ */
+public interface test8 {
+
+	/**
+	 * @noextend
+	 */
+	interface inner {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test9.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test9.java
new file mode 100644
index 0000000000..9d20b237c5
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/test9.java
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests invalid @noextend tags on nested inner interfaces
+ * @noextend
+ */
+public interface test9 {
+
+	/**
+	 * @noextend
+	 */
+	interface inner {
+		
+	}
+	
+	interface inner1 {
+		/**
+		 * @noextend
+		 */
+		interface inner2 {
+			
+		}
+	}
+	
+	interface inner2 {
+		
+	}
+}
+
+interface outer {
+	
+	/**
+	 * @noextend
+	 */
+	interface inner {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/valid/test1.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/valid/test1.java
new file mode 100644
index 0000000000..64510b6df4
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/valid/test1.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test valid tags on an interface
+ * @noimplement
+ */
+public interface test1 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/valid/test2.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/valid/test2.java
new file mode 100644
index 0000000000..5fd5455877
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/valid/test2.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests valid tags on an outer interface
+ */
+public interface test2 {
+
+}
+
+/**
+ * @noimplement
+ */
+interface outer {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/valid/test3.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/valid/test3.java
new file mode 100644
index 0000000000..d070f8a86d
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/valid/test3.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests valid tags on a member interface
+ */
+public interface test3 {
+
+	/**
+	 * @noimplement
+	 */
+	interface inner {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/valid/test4.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/valid/test4.java
new file mode 100644
index 0000000000..9968e96544
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/valid/test4.java
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Tests valid tags on nested inner interfaces
+ * @noimplement
+ */
+public interface test4 {
+
+	/**
+	 * @noimplement
+	 */
+	interface inner {
+		
+	}
+	
+	interface inner1 {
+		/**
+		 * @noimplement
+		 */
+		interface inner2 {
+			
+		}
+	}
+	
+	interface inner2 {
+		
+	}
+}
+
+interface outer {
+	
+	/**
+	 * @noimplement
+	 */
+	interface inner {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/valid/test5.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/valid/test5.java
new file mode 100644
index 0000000000..c25bd05af9
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/interface/valid/test5.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+
+/**
+ * Test valid tags on an interface in the default package
+ * @noimplement
+ */
+public interface test5 {
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test1.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test1.java
new file mode 100644
index 0000000000..b31d86cd1f
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test1.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noextend tag on methods in an annotation
+ */
+public @interface test1 {
+	
+	/**
+	 * @noextend
+	 * @return
+	 */
+	public int m1();
+	
+	/**
+	 * @noextend
+	 * @return
+	 */
+	public abstract char m2();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test10.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test10.java
new file mode 100644
index 0000000000..39ffb3e6f0
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test10.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test unsupported @noinstantiate tag on methods in an annotation in the default package
+ */
+public @interface test10 {
+	/**
+	 * @noinstantiate
+	 * @return
+	 */
+	public int m1();
+	
+	/**
+	 * @noinstantiate
+	 * @return
+	 */
+	public abstract char m2();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test11.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test11.java
new file mode 100644
index 0000000000..a0d4f78dfd
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test11.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noimplement tag on methods in an annotation
+ */
+public @interface test11 {
+	/**
+	 * @noimplement
+	 * @return
+	 */
+	public int m1();
+	
+	/**
+	 * @noimplement
+	 * @return
+	 */
+	public abstract char m2();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test12.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test12.java
new file mode 100644
index 0000000000..2b9545815b
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test12.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noimplement tag on outer annotation methods
+ */
+public @interface test12 {
+	
+}
+
+@interface outer {
+	/**
+	 * @noimplement
+	 * @return
+	 */
+	public int m1();
+	
+	/**
+	 * @noimplement
+	 * @return
+	 */
+	public abstract char m2();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test13.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test13.java
new file mode 100644
index 0000000000..cf1dd65f48
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test13.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noimplement tag on methods in an inner annotation
+ */
+public @interface test13 {
+	@interface inner {
+		/**
+		 * @noimplement
+		 * @return
+		 */
+		public int m1();
+		
+		/**
+		 * @noimplement
+		 * @return
+		 */
+		public abstract char m2();
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test14.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test14.java
new file mode 100644
index 0000000000..0ce929137c
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test14.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noimplement tag on methods in outer / inner annotations
+ */
+public @interface test14 {
+	@interface inner {
+		/**
+		 * @noimplement
+		 * @return
+		 */
+		public int m1();
+		
+		/**
+		 * @noimplement
+		 * @return
+		 */
+		public abstract char m2();
+		@interface inner2 {
+			/**
+			 * @noimplement
+			 * @return
+			 */
+			public int m1();
+			
+			/**
+			 * @noimplement
+			 * @return
+			 */
+			public abstract char m2();
+		}
+	}
+}
+
+@interface outer {
+	/**
+	 * @noimplement
+	 * @return
+	 */
+	public int m1();
+	
+	/**
+	 * @noimplement
+	 * @return
+	 */
+	public abstract char m2();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test15.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test15.java
new file mode 100644
index 0000000000..c250f09d8d
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test15.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test unsupported @noimplement tag on methods in an annotation in the default package
+ */
+public @interface test15 {
+	/**
+	 * @noimplement
+	 * @return
+	 */
+	public int m1();
+	
+	/**
+	 * @noimplement
+	 * @return
+	 */
+	public abstract char m2();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test16.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test16.java
new file mode 100644
index 0000000000..767d02646b
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test16.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @nooverride tag on methods in an annotation
+ */
+public @interface test16 {
+	/**
+	 * @nooverride
+	 * @return
+	 */
+	public int m1();
+	
+	/**
+	 * @nooverride
+	 * @return
+	 */
+	public abstract char m2();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test17.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test17.java
new file mode 100644
index 0000000000..a73b4684ad
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test17.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @nooverride tag on outer annotation methods
+ */
+public @interface test17 {
+	
+}
+
+@interface outer {
+	/**
+	 * @nooverride
+	 * @return
+	 */
+	public int m1();
+	
+	/**
+	 * @nooverride
+	 * @return
+	 */
+	public abstract char m2();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test18.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test18.java
new file mode 100644
index 0000000000..749dd7fd9c
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test18.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @nooverride tag on methods in an inner annotation
+ */
+public @interface test18 {
+	@interface inner {
+		/**
+		 * @nooverride
+		 * @return
+		 */
+		public int m1();
+		
+		/**
+		 * @nooverride
+		 * @return
+		 */
+		public abstract char m2();
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test19.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test19.java
new file mode 100644
index 0000000000..f4ccd631c5
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test19.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @nooverride tag on methods in outer / inner annotation
+ */
+public @interface test19 {
+	@interface inner {
+		/**
+		 * @nooverride
+		 * @return
+		 */
+		public int m1();
+		
+		/**
+		 * @nooverride
+		 * @return
+		 */
+		public abstract char m2();
+		@interface inner2 {
+			/**
+			 * @nooverride
+			 * @return
+			 */
+			public int m1();
+			
+			/**
+			 * @nooverride
+			 * @return
+			 */
+			public abstract char m2();
+		}
+	}
+}
+
+@interface outer {
+	/**
+	 * @nooverride
+	 * @return
+	 */
+	public int m1();
+	
+	/**
+	 * @nooverride
+	 * @return
+	 */
+	public abstract char m2();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test2.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test2.java
new file mode 100644
index 0000000000..e325d37568
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test2.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noextend tag on outer annotation methods
+ */
+public @interface test2 {
+	
+}
+
+@interface outer {
+	/**
+	 * @noextend
+	 * @return
+	 */
+	public int m1();
+	
+	/**
+	 * @noextend
+	 * @return
+	 */
+	public abstract char m2();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test20.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test20.java
new file mode 100644
index 0000000000..2c5240ef2b
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test20.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test unsupported @nooverride tag on methods in an annotation in the default package
+ */
+public @interface test20 {
+	/**
+	 * @nooverride
+	 * @return
+	 */
+	public int m1();
+	
+	/**
+	 * @nooverride
+	 * @return
+	 */
+	public abstract char m2();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test21.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test21.java
new file mode 100644
index 0000000000..9142314778
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test21.java
@@ -0,0 +1,81 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported tags on fields in outer / inner annotation
+ */
+public @interface test21 {
+	@interface inner {
+		/**
+		 * @nooverride
+		 * @noimplement
+		 * @noinstantiate
+		 * @noextend
+		 * @noreference
+		 * @return
+		 */
+		public int m1();
+		
+		/**
+		 * @nooverride
+		 * @noimplement
+		 * @noinstantiate
+		 * @noextend
+		 * @noreference
+		 * @return
+		 */
+		public abstract char m2();
+		@interface inner2 {
+			/**
+			 * @nooverride
+			 * @noimplement
+			 * @noinstantiate
+			 * @noextend
+			 * @noreference
+			 * @return
+			 */
+			public int m1();
+			
+			/**
+			 * @nooverride
+			 * @noimplement
+			 * @noinstantiate
+			 * @noextend
+			 * @noreference
+			 * @return
+			 */
+			public abstract char m2();
+		}
+	}
+}
+
+@interface outer {
+	/**
+	 * @nooverride
+	 * @noimplement
+	 * @noinstantiate
+	 * @noextend
+	 * @noreference
+	 * @return
+	 */
+	public int m1();
+	
+	/**
+	 * @nooverride
+	 * @noimplement
+	 * @noinstantiate
+	 * @noextend
+	 * @noreference
+	 * @return
+	 */
+	public abstract char m2();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test22.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test22.java
new file mode 100644
index 0000000000..d758b7878f
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test22.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noreference tag on annotation methods
+ */
+public @interface test22 {
+	/**
+	 * @noreference
+	 * @return
+	 */
+	public int m1();
+	
+	/**
+	 * @noreference
+	 * @return
+	 */
+	public abstract char m2();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test23.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test23.java
new file mode 100644
index 0000000000..3a878ea895
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test23.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noreference tag on outer annotation methods
+ */
+public @interface test23 {
+	
+}
+
+@interface outer {
+	/**
+	 * @noreference
+	 * @return
+	 */
+	public int m1();
+	
+	/**
+	 * @noreference
+	 * @return
+	 */
+	public abstract char m2();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test24.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test24.java
new file mode 100644
index 0000000000..cb2f386703
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test24.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noreference tag on annotation methods
+ */
+public @interface test24 {
+	@interface inner {
+		/**
+		 * @noreference
+		 * @return
+		 */
+		public int m1();
+		
+		/**
+		 * @noreference
+		 * @return
+		 */
+		public abstract char m2();
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test25.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test25.java
new file mode 100644
index 0000000000..02b0bae0a6
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test25.java
@@ -0,0 +1,47 @@
+
+
+/**
+ * Test unsupported @noreference tag on methods in outer / inner annotations
+ */
+public @interface test25 {
+	@interface inner {
+		/**
+		 * @noreference
+		 * @return
+		 */
+		public int m1();
+		
+		/**
+		 * @noreference
+		 * @return
+		 */
+		public abstract char m2();
+		@interface inner2 {
+			/**
+			 * @noreference
+			 * @return
+			 */
+			public int m1();
+			
+			/**
+			 * @noreference
+			 * @return
+			 */
+			public abstract char m2();
+		}
+	}
+}
+
+@interface outer {
+	/**
+	 * @noreference
+	 * @return
+	 */
+	public int m1();
+	
+	/**
+	 * @noreference
+	 * @return
+	 */
+	public abstract char m2();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test26.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test26.java
new file mode 100644
index 0000000000..93e6efdf3f
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test26.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test unsupported @noreference tag on annotation methods in the default package
+ */
+public @interface test26 {
+	/**
+	 * @noreference
+	 * @return
+	 */
+	public int m1();
+	
+	/**
+	 * @noreference
+	 * @return
+	 */
+	public abstract char m2();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test27.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test27.java
new file mode 100644
index 0000000000..5da9a1ee08
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test27.java
@@ -0,0 +1,42 @@
+package a.b.c;
+
+/**
+ * Test unsupported @noreference tag on methods in outer / inner annotations
+ */
+public @interface test27 {
+	@interface inner {
+		/**
+		 * @nooverride
+		 * @noimplement
+		 * @noinstantiate
+		 * @noextend
+		 * @noreference
+		 * @return
+		 */
+		public String m1() default "one";
+		
+		@interface inner2 {
+			/**
+			 * @nooverride
+			 * @noimplement
+			 * @noinstantiate
+			 * @noextend
+			 * @noreference
+			 * @return
+			 */
+			public String m1() default "one";
+		}
+	}
+}
+
+@interface outer {
+	/**
+	 * @nooverride
+	 * @noimplement
+	 * @noinstantiate
+	 * @noextend
+	 * @noreference
+	 * @return
+	 */
+	public String m1() default "one";
+}
\ No newline at end of file
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test28.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test28.java
new file mode 100644
index 0000000000..d7eec092b4
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test28.java
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test unsupported @noreference tag on annotation methods in the default package
+ */
+public @interface test28 {
+	@interface inner {
+		/**
+		 * @nooverride
+		 * @noimplement
+		 * @noinstantiate
+		 * @noextend
+		 * @noreference
+		 * @return
+		 */
+		public String m1() default "one";
+		
+		@interface inner2 {
+			/**
+			 * @nooverride
+			 * @noimplement
+			 * @noinstantiate
+			 * @noextend
+			 * @noreference
+			 * @return
+			 */
+			public String m1() default "one";
+		}
+	}
+}
+
+@interface outer {
+	/**
+	 * @nooverride
+	 * @noimplement
+	 * @noinstantiate
+	 * @noextend
+	 * @noreference
+	 * @return
+	 */
+	public String m1() default "one";
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test3.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test3.java
new file mode 100644
index 0000000000..64a776cee3
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test3.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noextend tag on methods in an inner annotation
+ */
+public @interface test3 {
+	@interface inner {
+		/**
+		 * @noextend
+		 * @return
+		 */
+		public int m1();
+		
+		/**
+		 * @noextend
+		 * @return
+		 */
+		public abstract char m2();
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test4.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test4.java
new file mode 100644
index 0000000000..04d643ab6d
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test4.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noextend tag on methods in outer / inner annotations
+ */
+public @interface test4 {
+	@interface inner {
+		/**
+		 * @noextend
+		 * @return
+		 */
+		public int m1();
+		
+		/**
+		 * @noextend
+		 * @return
+		 */
+		public abstract char m2();
+		@interface inner2 {
+			/**
+			 * @noextend
+			 * @return
+			 */
+			public int m1();
+			
+			/**
+			 * @noextend
+			 * @return
+			 */
+			public abstract char m2();
+		}
+	}
+}
+
+@interface outer {
+	/**
+	 * @noextend
+	 * @return
+	 */
+	public int m1();
+	
+	/**
+	 * @noextend
+	 * @return
+	 */
+	public abstract char m2();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test5.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test5.java
new file mode 100644
index 0000000000..a85a3dee74
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test5.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test unsupported @noextend tag on methods in an annotation in the default package
+ */
+public @interface test5 {
+	/**
+	 * @noextend
+	 * @return
+	 */
+	public int m1();
+	
+	/**
+	 * @noextend
+	 * @return
+	 */
+	public abstract char m2();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test6.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test6.java
new file mode 100644
index 0000000000..eeb36b3e90
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test6.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noinstantiate tag on methods in an annotation
+ */
+public @interface test6 {
+	/**
+	 * @noinstantiate
+	 * @return
+	 */
+	public int m1();
+	
+	/**
+	 * @noinstantiate
+	 * @return
+	 */
+	public abstract char m2();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test7.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test7.java
new file mode 100644
index 0000000000..bc1ee116d2
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test7.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noinstantiate tag on outer annotation methods
+ */
+public @interface test7 {
+	
+}
+
+@interface outer {
+	/**
+	 * @noinstantiate
+	 * @return
+	 */
+	public int m1();
+	
+	/**
+	 * @noinstantiate
+	 * @return
+	 */
+	public abstract char m2();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test8.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test8.java
new file mode 100644
index 0000000000..256c7c1eed
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test8.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noinstantiate tag on methods in an inner annotation
+ */
+public @interface test8 {
+	@interface inner {
+		/**
+		 * @noinstantiate
+		 * @return
+		 */
+		public int m1();
+		
+		/**
+		 * @noinstantiate
+		 * @return
+		 */
+		public abstract char m2();
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test9.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test9.java
new file mode 100644
index 0000000000..bca6fbf373
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/annotation/test9.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noinstantiate tag on methods in outer / inner annotations
+ */
+public @interface test9 {
+	@interface inner {
+		/**
+		 * @noinstantiate
+		 * @return
+		 */
+		public int m1();
+		
+		/**
+		 * @noinstantiate
+		 * @return
+		 */
+		public abstract char m2();
+		@interface inner2 {
+			/**
+			 * @noinstantiate
+			 * @return
+			 */
+			public int m1();
+			
+			/**
+			 * @noinstantiate
+			 * @return
+			 */
+			public abstract char m2();
+		}
+	}
+}
+
+@interface outer {
+	/**
+	 * @noinstantiate
+	 * @return
+	 */
+	public int m1();
+	
+	/**
+	 * @noinstantiate
+	 * @return
+	 */
+	public abstract char m2();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test1.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test1.java
new file mode 100644
index 0000000000..1f94f14459
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test1.java
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noimplement tag on class methods
+ */
+public class test1 {
+	/**
+	 * @noimplement
+	 * @return
+	 */
+	public int m1() {
+		return 0;
+	}
+	
+	/**
+	 * @noimplement
+	 * @return
+	 */
+	public final char m2() {
+		return 's';
+	}
+	
+	/**
+	 * @noimplement
+	 */
+	protected void m3() {
+		
+	}
+	
+	/**
+	 * @noimplement
+	 * @return
+	 */
+	protected static Object m4() {
+		return null;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test10.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test10.java
new file mode 100644
index 0000000000..8efb905a96
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test10.java
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test supported @noextend tag on class methods in the default package
+ */
+public class test10 {
+	/**
+	 * @noextend
+	 * @return
+	 */
+	public int m1() {
+		return 0;
+	}
+	
+	/**
+	 * @noextend
+	 * @return
+	 */
+	public final char m2() {
+		return 's';
+	}
+	
+	/**
+	 * @noextend
+	 */
+	protected void m3() {
+		
+	}
+	
+	/**
+	 * @noextend
+	 * @return
+	 */
+	protected static Object m4() {
+		return null;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test11.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test11.java
new file mode 100644
index 0000000000..b71aef2d0c
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test11.java
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noinstantiate tag on class methods
+ */
+public class test11 {
+	/**
+	 * @noinstantiate
+	 * @return
+	 */
+	public int m1() {
+		return 0;
+	}
+	
+	/**
+	 * @noinstantiate
+	 * @return
+	 */
+	public final char m2() {
+		return 's';
+	}
+	
+	/**
+	 * @noinstantiate
+	 */
+	protected void m3() {
+		
+	}
+	
+	/**
+	 * @noinstantiate
+	 * @return
+	 */
+	protected static Object m4() {
+		return null;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test12.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test12.java
new file mode 100644
index 0000000000..94a50b5f11
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test12.java
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test supported @noinstantiate tag on outer class methods
+ */
+public class test12 {
+	
+}
+
+class outer {
+	/**
+	 * @noinstantiate
+	 * @return
+	 */
+	public int m1() {
+		return 0;
+	}
+	
+	/**
+	 * @noinstantiate
+	 * @return
+	 */
+	public final char m2() {
+		return 's';
+	}
+	
+	/**
+	 * @noinstantiate
+	 */
+	protected void m3() {
+		
+	}
+	
+	/**
+	 * @noinstantiate
+	 * @return
+	 */
+	protected static Object m4() {
+		return null;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test13.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test13.java
new file mode 100644
index 0000000000..870ed49b0e
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test13.java
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test supported @noinstantiate tag on class methods
+ */
+public class test13 {
+	
+	static class inner {
+		/**
+		 * @noinstantiate
+		 * @return
+		 */
+		public int m1() {
+			return 0;
+		}
+		
+		/**
+		 * @noinstantiate
+		 * @return
+		 */
+		public final char m2() {
+			return 's';
+		}
+		
+		/**
+		 * @noinstantiate
+		 */
+		protected void m3() {
+			
+		}
+		
+		/**
+		 * @noinstantiate
+		 * @return
+		 */
+		protected static Object m4() {
+			return null;
+		}
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test14.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test14.java
new file mode 100644
index 0000000000..7500e86edc
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test14.java
@@ -0,0 +1,106 @@
+package a.b.c;
+
+
+/**
+ * Test supported @noinstantiate tag on methods in outer / inner classes
+ */
+public class test14 {
+	
+	static class inner {
+		/**
+		 * @noinstantiate
+		 * @return
+		 */
+		public int m1() {
+			return 0;
+		}
+		
+		/**
+		 * @noinstantiate
+		 * @return
+		 */
+		public final char m2() {
+			return 's';
+		}
+		
+		/**
+		 * @noinstantiate
+		 */
+		protected void m3() {
+			
+		}
+		
+		/**
+		 * @noinstantiate
+		 * @return
+		 */
+		protected static Object m4() {
+			return null;
+		}
+		static class inner2 {
+			/**
+			 * @noinstantiate
+			 * @return
+			 */
+			public int m1() {
+				return 0;
+			}
+			
+			/**
+			 * @noinstantiate
+			 * @return
+			 */
+			public final char m2() {
+				return 's';
+			}
+			
+			/**
+			 * @noinstantiate
+			 */
+			protected void m3() {
+				
+			}
+			
+			/**
+			 * @noinstantiate
+			 * @return
+			 */
+			protected static Object m4() {
+				return null;
+			}
+		}
+	}
+}
+
+class outer {
+	/**
+	 * @noinstantiate
+	 * @return
+	 */
+	public int m1() {
+		return 0;
+	}
+	
+	/**
+	 * @noinstantiate
+	 * @return
+	 */
+	public final char m2() {
+		return 's';
+	}
+	
+	/**
+	 * @noinstantiate
+	 */
+	protected void m3() {
+		
+	}
+	
+	/**
+	 * @noinstantiate
+	 * @return
+	 */
+	protected static Object m4() {
+		return null;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test15.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test15.java
new file mode 100644
index 0000000000..cb263372d9
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test15.java
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test supported @noinstantiate tag on class methods in the default package
+ */
+public class test15 {
+	/**
+	 * @noinstantiate
+	 * @return
+	 */
+	public int m1() {
+		return 0;
+	}
+	
+	/**
+	 * @noinstantiate
+	 * @return
+	 */
+	public final char m2() {
+		return 's';
+	}
+	
+	/**
+	 * @noinstantiate
+	 */
+	protected void m3() {
+		
+	}
+	
+	/**
+	 * @noinstantiate
+	 * @return
+	 */
+	protected static Object m4() {
+		return null;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test16.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test16.java
new file mode 100644
index 0000000000..86d0cc63e5
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test16.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @nooverride tag on private class methods
+ */
+public class test16 {
+	/**
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 * @return
+	 */
+	private int m1() {
+		return 0;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test17.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test17.java
new file mode 100644
index 0000000000..83bb25b735
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test17.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test supported @nooverride tag on private outer class methods
+ */
+public class test17 {
+	
+}
+
+class outer {
+	/**
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 * @return
+	 */
+	private int m1() {
+		return 0;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test18.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test18.java
new file mode 100644
index 0000000000..0731ffc919
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test18.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test supported @nooverride tag on private inner class methods
+ */
+public class test18 {
+	
+	static class inner {
+		/**
+		 * @nooverride This method is not intended to be re-implemented or extended by clients.
+		 * @return
+		 */
+		private int m1() {
+			return 0;
+		}
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test19.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test19.java
new file mode 100644
index 0000000000..f951685611
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test19.java
@@ -0,0 +1,37 @@
+package a.b.c;
+
+
+/**
+ * Test supported @nooverride tag on private methods in outer / inner classes
+ */
+public class test19 {
+	
+	static class inner {
+		/**
+		 * @nooverride This method is not intended to be re-implemented or extended by clients.
+		 * @return
+		 */
+		private int m1() {
+			return 0;
+		}
+		static class inner2 {
+			/**
+			 * @nooverride This method is not intended to be re-implemented or extended by clients.
+			 * @return
+			 */
+			private int m1() {
+				return 0;
+			}
+		}
+	}
+}
+
+class outer {
+	/**
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 * @return
+	 */
+	private int m1() {
+		return 0;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test2.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test2.java
new file mode 100644
index 0000000000..e220137149
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test2.java
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test supported @noimplement tag on outer class methods
+ */
+public class test2 {
+	
+}
+
+class outer {
+	/**
+	 * @noimplement
+	 * @return
+	 */
+	public int m1() {
+		return 0;
+	}
+	
+	/**
+	 * @noimplement
+	 * @return
+	 */
+	public final char m2() {
+		return 's';
+	}
+	
+	/**
+	 * @noimplement
+	 */
+	protected void m3() {
+		
+	}
+	
+	/**
+	 * @noimplement
+	 * @return
+	 */
+	protected static Object m4() {
+		return null;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test20.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test20.java
new file mode 100644
index 0000000000..6f306db3b9
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test20.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test supported @nooverride tag on private class methods in the default package
+ */
+public class test20 {
+	/**
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 * @return
+	 */
+	private int m1() {
+		return 0;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test21.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test21.java
new file mode 100644
index 0000000000..51f636a680
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test21.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @nooverride tag on final class methods
+ */
+public class test21 {
+	/**
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 * @return
+	 */
+	public final int m1() {
+		return 0;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test22.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test22.java
new file mode 100644
index 0000000000..c4edaff8f2
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test22.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test supported @nooverride tag on final outer class methods
+ */
+public class test22 {
+	
+}
+
+class outer {
+	/**
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 * @return
+	 */
+	public final int m1() {
+		return 0;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test23.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test23.java
new file mode 100644
index 0000000000..291fd35e25
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test23.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test supported @nooverride tag on final inner class methods
+ */
+public class test23 {
+	
+	static class inner {
+		/**
+		 * @nooverride This method is not intended to be re-implemented or extended by clients.
+		 * @return
+		 */
+		public final int m1() {
+			return 0;
+		}
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test24.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test24.java
new file mode 100644
index 0000000000..95e40ddb1f
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test24.java
@@ -0,0 +1,37 @@
+package a.b.c;
+
+
+/**
+ * Test supported @nooverride tag on final methods in outer / inner classes
+ */
+public class test24 {
+	
+	static class inner {
+		/**
+		 * @nooverride This method is not intended to be re-implemented or extended by clients.
+		 * @return
+		 */
+		public final int m1() {
+			return 0;
+		}
+		static class inner2 {
+			/**
+			 * @nooverride This method is not intended to be re-implemented or extended by clients.
+			 * @return
+			 */
+			public final int m1() {
+				return 0;
+			}
+		}
+	}
+}
+
+class outer {
+	/**
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 * @return
+	 */
+	public final int m1() {
+		return 0;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test25.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test25.java
new file mode 100644
index 0000000000..1dd0bcd2f7
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test25.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test supported @nooverride tag on final class methods in the default package
+ */
+public class test25 {
+	/**
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 * @return
+	 */
+	public final int m1() {
+		return 0;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test26.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test26.java
new file mode 100644
index 0000000000..4a1ccb77de
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test26.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noreference tag on private class methods
+ */
+public class test26 {
+	/**
+	 * @noreference 
+	 * @return
+	 */
+	private int m1() {
+		return 0;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test27.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test27.java
new file mode 100644
index 0000000000..52b1c84bb6
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test27.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test supported @noreference tag on private outer class methods
+ */
+public class test27 {
+	
+}
+
+class outer {
+	/**
+	 * @noreference 
+	 * @return
+	 */
+	private int m1() {
+		return 0;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test28.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test28.java
new file mode 100644
index 0000000000..f9cc99b86b
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test28.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test supported @noreference tag on private inner class methods
+ */
+public class test28 {
+	
+	static class inner {
+		/**
+		 * @noreference
+		 * @return
+		 */
+		private int m1() {
+			return 0;
+		}
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test29.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test29.java
new file mode 100644
index 0000000000..32137c1da4
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test29.java
@@ -0,0 +1,37 @@
+package a.b.c;
+
+
+/**
+ * Test supported @noreference tag on private methods in outer / inner classes
+ */
+public class test29 {
+	
+	static class inner {
+		/**
+		 * @noreference 
+		 * @return
+		 */
+		private int m1() {
+			return 0;
+		}
+		static class inner2 {
+			/**
+			 * @noreference 
+			 * @return
+			 */
+			private int m1() {
+				return 0;
+			}
+		}
+	}
+}
+
+class outer {
+	/**
+	 * @noreference 
+	 * @return
+	 */
+	private int m1() {
+		return 0;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test3.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test3.java
new file mode 100644
index 0000000000..948fab7e1b
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test3.java
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test supported @noimplement tag on class methods
+ */
+public class test3 {
+	
+	static class inner {
+		/**
+		 * @noimplement
+		 * @return
+		 */
+		public int m1() {
+			return 0;
+		}
+		
+		/**
+		 * @noimplement
+		 * @return
+		 */
+		public final char m2() {
+			return 's';
+		}
+		
+		/**
+		 * @noimplement
+		 */
+		protected void m3() {
+			
+		}
+		
+		/**
+		 * @noimplement
+		 * @return
+		 */
+		protected static Object m4() {
+			return null;
+		}
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test30.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test30.java
new file mode 100644
index 0000000000..3c8b2c9fa0
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test30.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test supported @noreference tag on private class methods in the default package
+ */
+public class test30 {
+	/**
+	 * @noreference 
+	 * @return
+	 */
+	private int m1() {
+		return 0;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test31.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test31.java
new file mode 100644
index 0000000000..0bb6cdffc7
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test31.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noreference tag on private class constructors
+ */
+public class test31 {
+	/**
+	 * Constructor
+	 * @noreference This constructor is not intended to be referenced by clients.
+	 */
+	private test31() {
+		
+	}
+	
+	/**
+	 * Constructor
+	 * @noreference This constructor is not intended to be referenced by clients.
+	 */
+	private test31(int i) {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test32.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test32.java
new file mode 100644
index 0000000000..2bb6d3fb50
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test32.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noreference tag on private outer class constructors
+ */
+public class test32 {
+	
+}
+
+class outer {
+	/**
+	 * Constructor
+	 * @noreference This constructor is not intended to be referenced by clients.
+	 */
+	private outer() {
+		
+	}
+	
+	/**
+	 * Constructor
+	 * @noreference This constructor is not intended to be referenced by clients.
+	 */
+	private outer(int i) {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test33.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test33.java
new file mode 100644
index 0000000000..8ac9a53b84
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test33.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noreference tag on private class constructors
+ */
+public class test33 {
+	class inner {
+		/**
+		 * Constructor
+		 * @noreference This constructor is not intended to be referenced by clients.
+		 */
+		private inner() {
+			
+		}
+		
+		/**
+		 * Constructor
+		 * @noreference This constructor is not intended to be referenced by clients.
+		 */
+		private inner(int i) {
+			
+		}
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test34.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test34.java
new file mode 100644
index 0000000000..6554dd3ae2
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test34.java
@@ -0,0 +1,61 @@
+package a.b.c;
+
+
+/**
+ * Test unsupported @noreference tag on private constructors in outer / inner classes
+ */
+public class test34 {
+	
+	static class inner {
+		/**
+		 * Constructor
+		 * @noreference This constructor is not intended to be referenced by clients.
+		 */
+		private inner() {
+			
+		}
+		
+		/**
+		 * Constructor
+		 * @noreference This constructor is not intended to be referenced by clients.
+		 */
+		private inner(int i) {
+			
+		}
+		class inner2 {
+			/**
+			 * Constructor
+			 * @noreference This constructor is not intended to be referenced by clients.
+			 */
+			private inner2() {
+				
+			}
+			
+			/**
+			 * Constructor
+			 * @noreference This constructor is not intended to be referenced by clients.
+			 */
+			private inner2(int i) {
+				
+			}
+		}
+	}
+}
+
+class outer {
+	/**
+	 * Constructor
+	 * @noreference This constructor is not intended to be referenced by clients.
+	 */
+	private outer() {
+		
+	}
+	
+	/**
+	 * Constructor
+	 * @noreference This constructor is not intended to be referenced by clients.
+	 */
+	private outer(int i) {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test35.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test35.java
new file mode 100644
index 0000000000..dee870c085
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test35.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test unsupported @noreference tag on private constructors in the default package
+ */
+public class test35 {
+	/**
+	 * Constructor
+	 * @noreference This constructor is not intended to be referenced by clients.
+	 */
+	private test35() {
+		
+	}
+	
+	/**
+	 * Constructor
+	 * @noreference This constructor is not intended to be referenced by clients.
+	 */
+	private test35(int i) {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test36.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test36.java
new file mode 100644
index 0000000000..572c31a3d8
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test36.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noinstantiate tag on constructors
+ */
+public class test36 {
+	/**
+	 * Constructor
+	 * @noinstantiate This constructor is not intended to be referenced by clients.
+	 */
+	public test36() {
+		
+	}
+	
+	/**
+	 * Constructor
+	 * @noinstantiate This constructor is not intended to be referenced by clients.
+	 */
+	public test36(int i) {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test37.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test37.java
new file mode 100644
index 0000000000..4d556ea2e8
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test37.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noinstantiate tag on outer class constructors
+ */
+public class test37 {
+	
+}
+
+class outer {
+	/**
+	 * Constructor
+	 * @noinstantiate This constructor is not intended to be referenced by clients.
+	 */
+	public outer() {
+		
+	}
+	
+	/**
+	 * Constructor
+	 * @noinstantiate This constructor is not intended to be referenced by clients.
+	 */
+	protected outer(int i) {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test38.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test38.java
new file mode 100644
index 0000000000..d2076dcd5b
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test38.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test supported @noinstantiate tag on inner class constructors
+ */
+public class test38 {
+	class inner {
+		/**
+		 * Constructor
+		 * @noinstantiate This constructor is not intended to be referenced by clients.
+		 */
+		public inner() {
+			
+		}
+		
+		/**
+		 * Constructor
+		 * @noinstantiate This constructor is not intended to be referenced by clients.
+		 */
+		protected inner(int i) {
+			
+		}
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test39.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test39.java
new file mode 100644
index 0000000000..bc94a3e225
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test39.java
@@ -0,0 +1,61 @@
+package a.b.c;
+
+
+/**
+ * Test supported @noinstantiate tag on constructors in outer / inner classes
+ */
+public class test39 {
+	
+	static class inner {
+		/**
+		 * Constructor
+		 * @noinstantiate This constructor is not intended to be referenced by clients.
+		 */
+		public inner() {
+			
+		}
+		
+		/**
+		 * Constructor
+		 * @noinstantiate This constructor is not intended to be referenced by clients.
+		 */
+		protected inner(int i) {
+			
+		}
+		static class inner2 {
+			/**
+			 * Constructor
+			 * @noinstantiate This constructor is not intended to be referenced by clients.
+			 */
+			public inner2() {
+				
+			}
+			
+			/**
+			 * Constructor
+			 * @noinstantiate This constructor is not intended to be referenced by clients.
+			 */
+			protected inner2(int i) {
+				
+			}
+		}
+	}
+}
+
+class outer {
+	/**
+	 * Constructor
+	 * @noinstantiate This constructor is not intended to be referenced by clients.
+	 */
+	public outer() {
+		
+	}
+	
+	/**
+	 * Constructor
+	 * @noinstantiate This constructor is not intended to be referenced by clients.
+	 */
+	protected outer(int i) {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test4.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test4.java
new file mode 100644
index 0000000000..b7c4e02de4
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test4.java
@@ -0,0 +1,106 @@
+package a.b.c;
+
+
+/**
+ * Test supported @noimplement tag on methods in outer / inner classes
+ */
+public class test4 {
+	
+	static class inner {
+		/**
+		 * @noimplement
+		 * @return
+		 */
+		public int m1() {
+			return 0;
+		}
+		
+		/**
+		 * @noimplement
+		 * @return
+		 */
+		public final char m2() {
+			return 's';
+		}
+		
+		/**
+		 * @noimplement
+		 */
+		protected void m3() {
+			
+		}
+		
+		/**
+		 * @noimplement
+		 * @return
+		 */
+		protected static Object m4() {
+			return null;
+		}
+		static class inner2 {
+			/**
+			 * @noimplement
+			 * @return
+			 */
+			public int m1() {
+				return 0;
+			}
+			
+			/**
+			 * @noimplement
+			 * @return
+			 */
+			public final char m2() {
+				return 's';
+			}
+			
+			/**
+			 * @noimplement
+			 */
+			protected void m3() {
+				
+			}
+			
+			/**
+			 * @noimplement
+			 * @return
+			 */
+			protected static Object m4() {
+				return null;
+			}
+		}
+	}
+}
+
+class outer {
+	/**
+	 * @noimplement
+	 * @return
+	 */
+	public int m1() {
+		return 0;
+	}
+	
+	/**
+	 * @noimplement
+	 * @return
+	 */
+	public final char m2() {
+		return 's';
+	}
+	
+	/**
+	 * @noimplement
+	 */
+	protected void m3() {
+		
+	}
+	
+	/**
+	 * @noimplement
+	 * @return
+	 */
+	protected static Object m4() {
+		return null;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test40.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test40.java
new file mode 100644
index 0000000000..83a50aa43e
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test40.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test supported @noinstantiate tag on constructors in the default package
+ */
+public class test40 {
+	/**
+	 * Constructor
+	 * @noinstantiate This constructor is not intended to be referenced by clients.
+	 */
+	public test40() {
+		
+	}
+	
+	/**
+	 * Constructor
+	 * @noinstantiate This constructor is not intended to be referenced by clients.
+	 */
+	protected test40(int i) {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test41.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test41.java
new file mode 100644
index 0000000000..0cd9ab9081
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test41.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noextend tag on constructors
+ */
+public class test41 {
+	/**
+	 * Constructor
+	 * @noextend This constructor is not intended to be referenced by clients.
+	 */
+	public test41() {
+		
+	}
+	
+	/**
+	 * Constructor
+	 * @noextend This constructor is not intended to be referenced by clients.
+	 */
+	public test41(int i) {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test42.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test42.java
new file mode 100644
index 0000000000..22e83c8375
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test42.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noextend tag on outer class constructors
+ */
+public class test42 {
+	
+}
+
+class outer {
+	/**
+	 * Constructor
+	 * @noextend This constructor is not intended to be referenced by clients.
+	 */
+	public outer() {
+		
+	}
+	
+	/**
+	 * Constructor
+	 * @noextend This constructor is not intended to be referenced by clients.
+	 */
+	protected outer(int i) {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test43.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test43.java
new file mode 100644
index 0000000000..9341083981
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test43.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test supported @noextend tag on inner class constructors
+ */
+public class test43 {
+	class inner {
+		/**
+		 * Constructor
+		 * @noextend This constructor is not intended to be referenced by clients.
+		 */
+		public inner() {
+			
+		}
+		
+		/**
+		 * Constructor
+		 * @noextend This constructor is not intended to be referenced by clients.
+		 */
+		protected inner(int i) {
+			
+		}
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test44.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test44.java
new file mode 100644
index 0000000000..26b90f6bb1
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test44.java
@@ -0,0 +1,61 @@
+package a.b.c;
+
+
+/**
+ * Test supported @noextend tag on constructors in outer / inner classes
+ */
+public class test44 {
+	
+	static class inner {
+		/**
+		 * Constructor
+		 * @noextend This constructor is not intended to be referenced by clients.
+		 */
+		public inner() {
+			
+		}
+		
+		/**
+		 * Constructor
+		 * @noextend This constructor is not intended to be referenced by clients.
+		 */
+		protected inner(int i) {
+			
+		}
+		static class inner2 {
+			/**
+			 * Constructor
+			 * @noextend This constructor is not intended to be referenced by clients.
+			 */
+			public inner2() {
+				
+			}
+			
+			/**
+			 * Constructor
+			 * @noextend This constructor is not intended to be referenced by clients.
+			 */
+			protected inner2(int i) {
+				
+			}
+		}
+	}
+}
+
+class outer {
+	/**
+	 * Constructor
+	 * @noextend This constructor is not intended to be referenced by clients.
+	 */
+	public outer() {
+		
+	}
+	
+	/**
+	 * Constructor
+	 * @noextend This constructor is not intended to be referenced by clients.
+	 */
+	protected outer(int i) {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test45.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test45.java
new file mode 100644
index 0000000000..6b24f6c581
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test45.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test supported @noextend tag on constructors in the default package
+ */
+public class test45 {
+	/**
+	 * Constructor
+	 * @noextend This constructor is not intended to be referenced by clients.
+	 */
+	public test45() {
+		
+	}
+	
+	/**
+	 * Constructor
+	 * @noextend This constructor is not intended to be referenced by clients.
+	 */
+	protected test45(int i) {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test46.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test46.java
new file mode 100644
index 0000000000..4b1f2f2154
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test46.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @nooverride tag on constructors
+ */
+public class test46 {
+	/**
+	 * Constructor
+	 * @nooverride This constructor is not intended to be referenced by clients.
+	 */
+	public test46() {
+		
+	}
+	
+	/**
+	 * Constructor
+	 * @nooverride This constructor is not intended to be referenced by clients.
+	 */
+	public test46(int i) {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test47.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test47.java
new file mode 100644
index 0000000000..3b4874ba9e
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test47.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @nooverride tag on outer class constructors
+ */
+public class test47 {
+	
+}
+
+class outer {
+	/**
+	 * Constructor
+	 * @nooverride This constructor is not intended to be referenced by clients.
+	 */
+	public outer() {
+		
+	}
+	
+	/**
+	 * Constructor
+	 * @nooverride This constructor is not intended to be referenced by clients.
+	 */
+	protected outer(int i) {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test48.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test48.java
new file mode 100644
index 0000000000..f5594bb2b5
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test48.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test supported @nooverride tag on inner class constructors
+ */
+public class test48 {
+	class inner {
+		/**
+		 * Constructor
+		 * @nooverride This constructor is not intended to be referenced by clients.
+		 */
+		public inner() {
+			
+		}
+		
+		/**
+		 * Constructor
+		 * @nooverride This constructor is not intended to be referenced by clients.
+		 */
+		protected inner(int i) {
+			
+		}
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test49.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test49.java
new file mode 100644
index 0000000000..414a4dc1d6
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test49.java
@@ -0,0 +1,61 @@
+package a.b.c;
+
+
+/**
+ * Test supported @nooverride tag on constructors in outer / inner classes
+ */
+public class test49 {
+	
+	static class inner {
+		/**
+		 * Constructor
+		 * @nooverride This constructor is not intended to be referenced by clients.
+		 */
+		public inner() {
+			
+		}
+		
+		/**
+		 * Constructor
+		 * @nooverride This constructor is not intended to be referenced by clients.
+		 */
+		protected inner(int i) {
+			
+		}
+		static class inner2 {
+			/**
+			 * Constructor
+			 * @nooverride This constructor is not intended to be referenced by clients.
+			 */
+			public inner2() {
+				
+			}
+			
+			/**
+			 * Constructor
+			 * @nooverride This constructor is not intended to be referenced by clients.
+			 */
+			protected inner2(int i) {
+				
+			}
+		}
+	}
+}
+
+class outer {
+	/**
+	 * Constructor
+	 * @nooverride This constructor is not intended to be referenced by clients.
+	 */
+	public outer() {
+		
+	}
+	
+	/**
+	 * Constructor
+	 * @nooverride This constructor is not intended to be referenced by clients.
+	 */
+	protected outer(int i) {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test5.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test5.java
new file mode 100644
index 0000000000..6d266d81e5
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test5.java
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test supported @noimplement tag on class methods in the default package
+ */
+public class test5 {
+	/**
+	 * @noimplement
+	 * @return
+	 */
+	public int m1() {
+		return 0;
+	}
+	
+	/**
+	 * @noimplement
+	 * @return
+	 */
+	public final char m2() {
+		return 's';
+	}
+	
+	/**
+	 * @noimplement
+	 */
+	protected void m3() {
+		
+	}
+	
+	/**
+	 * @noimplement
+	 * @return
+	 */
+	protected static Object m4() {
+		return null;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test50.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test50.java
new file mode 100644
index 0000000000..70f225fe9a
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test50.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test supported @nooverride tag on constructors in the default package
+ */
+public class test50 {
+	/**
+	 * Constructor
+	 * @nooverride This constructor is not intended to be referenced by clients.
+	 */
+	public test50() {
+		
+	}
+	
+	/**
+	 * Constructor
+	 * @nooverride This constructor is not intended to be referenced by clients.
+	 */
+	protected test50(int i) {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test51.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test51.java
new file mode 100644
index 0000000000..fa9dd52d6d
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test51.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noimplement tag on constructors
+ */
+public class test51 {
+	/**
+	 * Constructor
+	 * @noimplement This constructor is not intended to be referenced by clients.
+	 */
+	public test51() {
+		
+	}
+	
+	/**
+	 * Constructor
+	 * @noimplement This constructor is not intended to be referenced by clients.
+	 */
+	public test51(int i) {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test52.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test52.java
new file mode 100644
index 0000000000..40762c9fe2
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test52.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noimplement tag on outer class constructors
+ */
+public class test52 {
+	
+}
+
+class outer {
+	/**
+	 * Constructor
+	 * @noimplement This constructor is not intended to be referenced by clients.
+	 */
+	public outer() {
+		
+	}
+	
+	/**
+	 * Constructor
+	 * @noimplement This constructor is not intended to be referenced by clients.
+	 */
+	protected outer(int i) {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test53.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test53.java
new file mode 100644
index 0000000000..ea267bca33
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test53.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test supported @noimplement tag on inner class constructors
+ */
+public class test53 {
+	class inner {
+		/**
+		 * Constructor
+		 * @noimplement This constructor is not intended to be referenced by clients.
+		 */
+		public inner() {
+			
+		}
+		
+		/**
+		 * Constructor
+		 * @noimplement This constructor is not intended to be referenced by clients.
+		 */
+		protected inner(int i) {
+			
+		}
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test54.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test54.java
new file mode 100644
index 0000000000..eebca89303
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test54.java
@@ -0,0 +1,61 @@
+package a.b.c;
+
+
+/**
+ * Test supported @noimplement tag on constructors in outer / inner classes
+ */
+public class test54 {
+	
+	static class inner {
+		/**
+		 * Constructor
+		 * @noimplement This constructor is not intended to be referenced by clients.
+		 */
+		public inner() {
+			
+		}
+		
+		/**
+		 * Constructor
+		 * @noimplement This constructor is not intended to be referenced by clients.
+		 */
+		protected inner(int i) {
+			
+		}
+		static class inner2 {
+			/**
+			 * Constructor
+			 * @noimplement This constructor is not intended to be referenced by clients.
+			 */
+			public inner2() {
+				
+			}
+			
+			/**
+			 * Constructor
+			 * @noimplement This constructor is not intended to be referenced by clients.
+			 */
+			protected inner2(int i) {
+				
+			}
+		}
+	}
+}
+
+class outer {
+	/**
+	 * Constructor
+	 * @noimplement This constructor is not intended to be referenced by clients.
+	 */
+	public outer() {
+		
+	}
+	
+	/**
+	 * Constructor
+	 * @noimplement This constructor is not intended to be referenced by clients.
+	 */
+	protected outer(int i) {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test55.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test55.java
new file mode 100644
index 0000000000..4a2b60ff60
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test55.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test supported @noimplement tag on constructors in the default package
+ */
+public class test55 {
+	/**
+	 * Constructor
+	 * @noimplement This constructor is not intended to be referenced by clients.
+	 */
+	public test55() {
+		
+	}
+	
+	/**
+	 * Constructor
+	 * @noimplement This constructor is not intended to be referenced by clients.
+	 */
+	protected test55(int i) {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test56.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test56.java
new file mode 100644
index 0000000000..412f4411c1
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test56.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noreference tag on private class constructors
+ */
+public class test56 {
+	/**
+	 * Constructor
+	 * @noreference This constructor is not intended to be referenced by clients.
+	 * @noimplement
+	 * @noinstantiate
+	 */
+	private test56() {
+		
+	}
+	
+	/**
+	 * Constructor
+	 * @noreference This constructor is not intended to be referenced by clients.
+	 * @nooverride
+	 * @noextend
+	 */
+	private test56(int i) {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test57.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test57.java
new file mode 100644
index 0000000000..7e1d556244
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test57.java
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * 
+ */
+public class test57 {
+
+	/**
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 */
+	public static void m1() {
+		
+	}
+	
+	static class inner {
+		/**
+		 * @nooverride This method is not intended to be re-implemented or extended by clients.
+		 */
+		public static final void m1() {
+			
+		}
+	}
+}
+
+class outer {
+	/**
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 */
+	static void m3() {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test6.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test6.java
new file mode 100644
index 0000000000..8a9770301d
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test6.java
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test supported @noextend tag on class methods
+ */
+public class test6 {
+	/**
+	 * @noextend
+	 * @return
+	 */
+	public int m1() {
+		return 0;
+	}
+	
+	/**
+	 * @noextend
+	 * @return
+	 */
+	public final char m2() {
+		return 's';
+	}
+	
+	/**
+	 * @noextend
+	 */
+	protected void m3() {
+		
+	}
+	
+	/**
+	 * @noextend
+	 * @return
+	 */
+	protected static Object m4() {
+		return null;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test7.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test7.java
new file mode 100644
index 0000000000..59c2f4ac8a
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test7.java
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test supported @noextend tag on outer class methods
+ */
+public class test7 {
+	
+}
+
+class outer {
+	/**
+	 * @noextend
+	 * @return
+	 */
+	public int m1() {
+		return 0;
+	}
+	
+	/**
+	 * @noextend
+	 * @return
+	 */
+	public final char m2() {
+		return 's';
+	}
+	
+	/**
+	 * @noextend
+	 */
+	protected void m3() {
+		
+	}
+	
+	/**
+	 * @noextend
+	 * @return
+	 */
+	protected static Object m4() {
+		return null;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test8.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test8.java
new file mode 100644
index 0000000000..3931a08e5c
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test8.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test supported @noextend tag on class methods
+ */
+public class test8 {
+	class inner {
+		/**
+		 * @noextend
+		 * @return
+		 */
+		public int m1() {
+			return 0;
+		}
+		
+		/**
+		 * @noextend
+		 * @return
+		 */
+		public final char m2() {
+			return 's';
+		}
+		
+		/**
+		 * @noextend
+		 */
+		protected void m3() {
+			
+		}
+		
+		/**
+		 * @noextend
+		 * @return
+		 */
+		protected static Object m4() {
+			return null;
+		}
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test9.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test9.java
new file mode 100644
index 0000000000..1b87b10689
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/class/test9.java
@@ -0,0 +1,106 @@
+package a.b.c;
+
+
+/**
+ * Test supported @noextend tag on methods in outer / inner classes
+ */
+public class test9 {
+	
+	static class inner {
+		/**
+		 * @noextend
+		 * @return
+		 */
+		public int m1() {
+			return 0;
+		}
+		
+		/**
+		 * @noextend
+		 * @return
+		 */
+		public final char m2() {
+			return 's';
+		}
+		
+		/**
+		 * @noextend
+		 */
+		protected void m3() {
+			
+		}
+		
+		/**
+		 * @noextend
+		 * @return
+		 */
+		protected static Object m4() {
+			return null;
+		}
+		static class inner2 {
+			/**
+			 * @noextend
+			 * @return
+			 */
+			public int m1() {
+				return 0;
+			}
+			
+			/**
+			 * @noextend
+			 * @return
+			 */
+			public final char m2() {
+				return 's';
+			}
+			
+			/**
+			 * @noextend
+			 */
+			protected void m3() {
+				
+			}
+			
+			/**
+			 * @noextend
+			 * @return
+			 */
+			protected static Object m4() {
+				return null;
+			}
+		}
+	}
+}
+
+class outer {
+	/**
+	 * @noextend
+	 * @return
+	 */
+	public int m1() {
+		return 0;
+	}
+	
+	/**
+	 * @noextend
+	 * @return
+	 */
+	public final char m2() {
+		return 's';
+	}
+	
+	/**
+	 * @noextend
+	 */
+	protected void m3() {
+		
+	}
+	
+	/**
+	 * @noextend
+	 * @return
+	 */
+	protected static Object m4() {
+		return null;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test1.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test1.java
new file mode 100644
index 0000000000..492e208fbe
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test1.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noextend tag on methods in an enum
+ */
+public enum test1 {
+	
+	A;
+	
+	/**
+	 * @noextend
+	 * @return
+	 */
+	public int m1() {
+		return 0;
+	}
+	
+	/**
+	 * @noextend
+	 * @return
+	 */
+	public char m2() {
+		return 's';
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test10.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test10.java
new file mode 100644
index 0000000000..4363c4ccd5
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test10.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test unsupported @noinstantiate tag on methods in an enum in the default package
+ */
+public enum test10 {
+	A;
+	/**
+	 * @noinstantiate
+	 * @return
+	 */
+	public int m1() {
+		return 0;
+	}
+	
+	/**
+	 * @noinstantiate
+	 * @return
+	 */
+	public final char m2() {
+		return 's';
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test11.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test11.java
new file mode 100644
index 0000000000..a9ec6f3fc7
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test11.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noimplement tag on methods in an enum
+ */
+public enum test11 {
+	A;
+	/**
+	 * @noimplement
+	 * @return
+	 */
+	public int m1() {
+		return 0;
+	}
+	
+	/**
+	 * @noimplement
+	 * @return
+	 */
+	public final char m2() {
+		return 's';
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test12.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test12.java
new file mode 100644
index 0000000000..e3c6c7a1c6
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test12.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noimplement tag on outer enum methods
+ */
+public enum test12 {
+	
+}
+
+enum outer {
+	A;
+	/**
+	 * @noimplement
+	 * @return
+	 */
+	public int m1() {
+		return 0;
+	}
+	
+	/**
+	 * @noimplement
+	 * @return
+	 */
+	public final char m2() {
+		return 's';
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test13.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test13.java
new file mode 100644
index 0000000000..d0d0b87698
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test13.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noimplement tag on methods in an inner enum
+ */
+public enum test13 {
+	A;
+	enum inner {
+		A;
+		/**
+		 * @noimplement
+		 * @return
+		 */
+		public int m1() {
+			return 0;
+		}
+		
+		/**
+		 * @noimplement
+		 * @return
+		 */
+		public final char m2() {
+			return 's';
+		}
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test14.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test14.java
new file mode 100644
index 0000000000..cd6dbf74d4
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test14.java
@@ -0,0 +1,73 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noimplement tag on methods in outer / inner enums
+ */
+public enum test14 {
+	A;
+	enum inner {
+		A;
+		/**
+		 * @noimplement
+		 * @return
+		 */
+		public int m1() {
+			return 0;
+		}
+		
+		/**
+		 * @noimplement
+		 * @return
+		 */
+		public final char m2() {
+			return 's';
+		}
+		enum inner2 {
+			A;
+			/**
+			 * @noimplement
+			 * @return
+			 */
+			public int m1() {
+				return 0;
+			}
+			
+			/**
+			 * @noimplement
+			 * @return
+			 */
+			public final char m2() {
+				return 's';
+			}
+		}
+	}
+}
+
+enum outer {
+	A;
+	/**
+	 * @noimplement
+	 * @return
+	 */
+	public int m1() {
+		return 0;
+	}
+	
+	/**
+	 * @noimplement
+	 * @return
+	 */
+	public final char m2() {
+		return 's';
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test15.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test15.java
new file mode 100644
index 0000000000..bf25c1ad07
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test15.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test unsupported @noimplement tag on methods in an enum in the default package
+ */
+public enum test15 {
+	A;
+	/**
+	 * @noimplement
+	 * @return
+	 */
+	public int m1() {
+		return 0;
+	}
+	
+	/**
+	 * @noimplement
+	 * @return
+	 */
+	public final char m2() {
+		return 's';
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test16.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test16.java
new file mode 100644
index 0000000000..bab669dd0e
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test16.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @nooverride tag on methods in an enum
+ */
+public enum test16 {
+	A;
+	/**
+	 * @nooverride
+	 * @return
+	 */
+	public int m1() {
+		return 0;
+	}
+	
+	/**
+	 * @nooverride
+	 * @return
+	 */
+	public final char m2() {
+		return 's';
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test17.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test17.java
new file mode 100644
index 0000000000..e5d93a8784
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test17.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @nooverride tag on outer enum methods
+ */
+public enum test17 {
+	
+}
+
+enum outer {
+	A;
+	/**
+	 * @nooverride
+	 * @return
+	 */
+	public int m1() {
+		return 0;
+	}
+	
+	/**
+	 * @nooverride
+	 * @return
+	 */
+	public final char m2() {
+		return 's';
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test18.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test18.java
new file mode 100644
index 0000000000..75f45d6b91
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test18.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @nooverride tag on methods in an inner enum
+ */
+public enum test18 {
+	A;
+	enum inner {
+		A;
+		/**
+		 * @nooverride
+		 * @return
+		 */
+		public int m1() {
+			return 0;
+		}
+		
+		/**
+		 * @nooverride
+		 * @return
+		 */
+		public final char m2() {
+			return 's';
+		}
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test19.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test19.java
new file mode 100644
index 0000000000..2836a88b66
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test19.java
@@ -0,0 +1,73 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @nooverride tag on methods in outer / inner enums
+ */
+public enum test19 {
+	A;
+	enum inner {
+		A;
+		/**
+		 * @nooverride
+		 * @return
+		 */
+		public int m1() {
+			return 0;
+		}
+		
+		/**
+		 * @nooverride
+		 * @return
+		 */
+		public final char m2() {
+			return 's';
+		}
+		enum inner2 {
+			A;
+			/**
+			 * @nooverride
+			 * @return
+			 */
+			public int m1() {
+				return 0;
+			}
+			
+			/**
+			 * @nooverride
+			 * @return
+			 */
+			public final char m2() {
+				return 's';
+			}
+		}
+	}
+}
+
+enum outer {
+	A;
+	/**
+	 * @nooverride
+	 * @return
+	 */
+	public int m1() {
+		return 0;
+	}
+	
+	/**
+	 * @nooverride
+	 * @return
+	 */
+	public final char m2() {
+		return 's';
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test2.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test2.java
new file mode 100644
index 0000000000..4aaa3fd9ad
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test2.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noextend tag on outer enum methods
+ */
+public enum test2 {
+	
+}
+
+enum outer {
+	A;
+	
+	/**
+	 * @noextend
+	 * @return
+	 */
+	public int m1() {
+		return 0;
+	}
+	
+	/**
+	 * @noextend
+	 * @return
+	 */
+	public char m2() {
+		return 's';
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test20.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test20.java
new file mode 100644
index 0000000000..3497a7d2e0
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test20.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test unsupported @nooverride tag on methods in an enum in the default package
+ */
+public enum test20 {
+	A;
+	/**
+	 * @nooverride
+	 * @return
+	 */
+	public int m1() {
+		return 0;
+	}
+	
+	/**
+	 * @nooverride
+	 * @return
+	 */
+	public final char m2() {
+		return 's';
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test21.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test21.java
new file mode 100644
index 0000000000..5b0f0e1634
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test21.java
@@ -0,0 +1,91 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported tags on fields in outer / inner annotation
+ */
+public enum test21 {
+	A;
+	enum inner {
+		A;
+		/**
+		 * @nooverride
+		 * @noimplement
+		 * @noinstantiate
+		 * @noextend
+		 * @return
+		 */
+		public int m1() {
+			return 0;
+		}
+		
+		/**
+		 * @nooverride
+		 * @noimplement
+		 * @noinstantiate
+		 * @noextend
+		 * @return
+		 */
+		public final char m2() {
+			return 's';
+		}
+		enum inner2 {
+			A;
+			/**
+			 * @nooverride
+			 * @noimplement
+			 * @noinstantiate
+			 * @noextend
+			 * @return
+			 */
+			public int m1() {
+				return 0;
+			}
+			
+			/**
+			 * @nooverride
+			 * @noimplement
+			 * @noinstantiate
+			 * @noextend
+			 * @return
+			 */
+			public final char m2() {
+				return 's';
+			}
+		}
+	}
+}
+
+enum outer {
+	A;
+	/**
+	 * @nooverride
+	 * @noimplement
+	 * @noinstantiate
+	 * @noextend
+	 * @return
+	 */
+	public int m1() {
+		return 0;
+	}
+	
+	/**
+	 * @nooverride
+	 * @noimplement
+	 * @noinstantiate
+	 * @noextend
+	 * @return
+	 */
+	public final char m2() {
+		return 's';
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test3.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test3.java
new file mode 100644
index 0000000000..13457479d6
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test3.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noextend tag on methods in an inner enum
+ */
+public enum test3 {
+	A;
+	enum inner {
+		A;
+		
+		/**
+		 * @noextend
+		 * @return
+		 */
+		public int m1() {
+			return 0;
+		}
+		
+		/**
+		 * @noextend
+		 * @return
+		 */
+		public char m2() {
+			return 's';
+		}
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test4.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test4.java
new file mode 100644
index 0000000000..edc27f78ef
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test4.java
@@ -0,0 +1,76 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noextend tag on methods in outer / inner annotations
+ */
+public enum test4 {
+	A;
+	enum inner {
+		A;
+		
+		/**
+		 * @noextend
+		 * @return
+		 */
+		public int m1() {
+			return 0;
+		}
+		
+		/**
+		 * @noextend
+		 * @return
+		 */
+		public char m2() {
+			return 's';
+		}
+		enum inner2 {
+			A;
+			
+			/**
+			 * @noextend
+			 * @return
+			 */
+			public int m1() {
+				return 0;
+			}
+			
+			/**
+			 * @noextend
+			 * @return
+			 */
+			public char m2() {
+				return 's';
+			}
+		}
+	}
+}
+
+enum outer {
+A;
+	
+	/**
+	 * @noextend
+	 * @return
+	 */
+	public int m1() {
+		return 0;
+	}
+	
+	/**
+	 * @noextend
+	 * @return
+	 */
+	public char m2() {
+		return 's';
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test5.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test5.java
new file mode 100644
index 0000000000..d54d5679dc
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test5.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test unsupported @noextend tag on methods in an enum in the default package
+ */
+public enum test5 {
+	A;
+	
+	/**
+	 * @noextend
+	 * @return
+	 */
+	public int m1() {
+		return 0;
+	}
+	
+	/**
+	 * @noextend
+	 * @return
+	 */
+	public char m2() {
+		return 's';
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test6.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test6.java
new file mode 100644
index 0000000000..2df5408086
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test6.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noinstantiate tag on methods in an enum
+ */
+public enum test6 {
+	A;
+	/**
+	 * @noinstantiate
+	 * @return
+	 */
+	public int m1() {
+		return 0;
+	}
+	
+	/**
+	 * @noinstantiate
+	 * @return
+	 */
+	public final char m2() {
+		return 's';
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test7.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test7.java
new file mode 100644
index 0000000000..c4479cd4ba
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test7.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noinstantiate tag on outer enum methods
+ */
+public enum test7 {
+	
+}
+
+enum outer {
+	A;
+	/**
+	 * @noinstantiate
+	 * @return
+	 */
+	public int m1() {
+		return 0;
+	}
+	
+	/**
+	 * @noinstantiate
+	 * @return
+	 */
+	public final char m2() {
+		return 's';
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test8.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test8.java
new file mode 100644
index 0000000000..e91c9db039
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test8.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noinstantiate tag on methods in an inner enum
+ */
+public enum test8 {
+	A;
+	enum inner {
+		A;
+		/**
+		 * @noinstantiate
+		 * @return
+		 */
+		public int m1() {
+			return 0;
+		}
+		
+		/**
+		 * @noinstantiate
+		 * @return
+		 */
+		public final char m2() {
+			return 's';
+		}
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test9.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test9.java
new file mode 100644
index 0000000000..bcc26d9b95
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/enum/test9.java
@@ -0,0 +1,73 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noinstantiate tag on methods in outer / inner enums
+ */
+public enum test9 {
+	A;
+	enum inner {
+		A;
+		/**
+		 * @noinstantiate
+		 * @return
+		 */
+		public int m1() {
+			return 0;
+		}
+		
+		/**
+		 * @noinstantiate
+		 * @return
+		 */
+		public final char m2() {
+			return 's';
+		}
+		enum inner2 {
+			A;
+			/**
+			 * @noinstantiate
+			 * @return
+			 */
+			public int m1() {
+				return 0;
+			}
+			
+			/**
+			 * @noinstantiate
+			 * @return
+			 */
+			public final char m2() {
+				return 's';
+			}
+		}
+	}
+}
+
+enum outer {
+	A;
+	/**
+	 * @noinstantiate
+	 * @return
+	 */
+	public int m1() {
+		return 0;
+	}
+	
+	/**
+	 * @noinstantiate
+	 * @return
+	 */
+	public final char m2() {
+		return 's';
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test1.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test1.java
new file mode 100644
index 0000000000..c5b10f5156
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test1.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noextend tag on methods in an interface
+ */
+public interface test1 {
+	
+	/**
+	 * @noextend
+	 * @return
+	 */
+	public int m1();
+	
+	/**
+	 * @noextend
+	 * @return
+	 */
+	public abstract char m2();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test10.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test10.java
new file mode 100644
index 0000000000..96d8189eb8
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test10.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test unsupported @noinstantiate tag on methods in an interface in the default package
+ */
+public interface test10 {
+	/**
+	 * @noinstantiate
+	 * @return
+	 */
+	public int m1();
+	
+	/**
+	 * @noinstantiate
+	 * @return
+	 */
+	public abstract char m2();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test11.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test11.java
new file mode 100644
index 0000000000..56a117d354
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test11.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noimplement tag on methods in an interface
+ */
+public interface test11 {
+	/**
+	 * @noimplement
+	 * @return
+	 */
+	public int m1();
+	
+	/**
+	 * @noimplement
+	 * @return
+	 */
+	public abstract char m2();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test12.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test12.java
new file mode 100644
index 0000000000..a04e1effb2
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test12.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noimplement tag on outer interface methods
+ */
+public interface test12 {
+	
+}
+
+interface outer {
+	/**
+	 * @noimplement
+	 * @return
+	 */
+	public int m1();
+	
+	/**
+	 * @noimplement
+	 * @return
+	 */
+	public abstract char m2();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test13.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test13.java
new file mode 100644
index 0000000000..28c250f84d
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test13.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noimplement tag on methods in an inner interface
+ */
+public interface test13 {
+	interface inner {
+		/**
+		 * @noimplement
+		 * @return
+		 */
+		public int m1();
+		
+		/**
+		 * @noimplement
+		 * @return
+		 */
+		public abstract char m2();
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test14.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test14.java
new file mode 100644
index 0000000000..d44846ecb3
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test14.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noimplement tag on methods in outer / inner interfaces
+ */
+public interface test14 {
+	interface inner {
+		/**
+		 * @noimplement
+		 * @return
+		 */
+		public int m1();
+		
+		/**
+		 * @noimplement
+		 * @return
+		 */
+		public abstract char m2();
+		interface inner2 {
+			/**
+			 * @noimplement
+			 * @return
+			 */
+			public int m1();
+			
+			/**
+			 * @noimplement
+			 * @return
+			 */
+			public abstract char m2();
+		}
+	}
+}
+
+interface outer {
+	/**
+	 * @noimplement
+	 * @return
+	 */
+	public int m1();
+	
+	/**
+	 * @noimplement
+	 * @return
+	 */
+	public abstract char m2();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test15.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test15.java
new file mode 100644
index 0000000000..2582b5f3c2
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test15.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test unsupported @noimplement tag on methods in an interface in the default package
+ */
+public interface test15 {
+	/**
+	 * @noimplement
+	 * @return
+	 */
+	public int m1();
+	
+	/**
+	 * @noimplement
+	 * @return
+	 */
+	public abstract char m2();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test16.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test16.java
new file mode 100644
index 0000000000..9e96171e94
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test16.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @nooverride tag on methods in an interface
+ */
+public interface test16 {
+	/**
+	 * @nooverride
+	 * @return
+	 */
+	public int m1();
+	
+	/**
+	 * @nooverride
+	 * @return
+	 */
+	public abstract char m2();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test17.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test17.java
new file mode 100644
index 0000000000..72b6727b74
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test17.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @nooverride tag on outer interface methods
+ */
+public interface test17 {
+	
+}
+
+interface outer {
+	/**
+	 * @nooverride
+	 * @return
+	 */
+	public int m1();
+	
+	/**
+	 * @nooverride
+	 * @return
+	 */
+	public abstract char m2();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test18.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test18.java
new file mode 100644
index 0000000000..78cb071656
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test18.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @nooverride tag on methods in an inner interface
+ */
+public interface test18 {
+	interface inner {
+		/**
+		 * @nooverride
+		 * @return
+		 */
+		public int m1();
+		
+		/**
+		 * @nooverride
+		 * @return
+		 */
+		public abstract char m2();
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test19.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test19.java
new file mode 100644
index 0000000000..5e7f1ad166
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test19.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @nooverride tag on methods in outer / inner interfaces
+ */
+public interface test19 {
+	interface inner {
+		/**
+		 * @nooverride
+		 * @return
+		 */
+		public int m1();
+		
+		/**
+		 * @nooverride
+		 * @return
+		 */
+		public abstract char m2();
+		interface inner2 {
+			/**
+			 * @nooverride
+			 * @return
+			 */
+			public int m1();
+			
+			/**
+			 * @nooverride
+			 * @return
+			 */
+			public abstract char m2();
+		}
+	}
+}
+
+interface outer {
+	/**
+	 * @nooverride
+	 * @return
+	 */
+	public int m1();
+	
+	/**
+	 * @nooverride
+	 * @return
+	 */
+	public abstract char m2();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test2.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test2.java
new file mode 100644
index 0000000000..ac3fcf0716
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test2.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noextend tag on outer interface methods
+ */
+public interface test2 {
+	
+}
+
+interface outer {
+	/**
+	 * @noextend
+	 * @return
+	 */
+	public int m1();
+	
+	/**
+	 * @noextend
+	 * @return
+	 */
+	public abstract char m2();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test20.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test20.java
new file mode 100644
index 0000000000..092f0a4e47
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test20.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test unsupported @nooverride tag on methods in an interface in the default package
+ */
+public interface test20 {
+	/**
+	 * @nooverride
+	 * @return
+	 */
+	public int m1();
+	
+	/**
+	 * @nooverride
+	 * @return
+	 */
+	public abstract char m2();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test21.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test21.java
new file mode 100644
index 0000000000..1365aa96b0
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test21.java
@@ -0,0 +1,75 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported tags on fields in outer / inner interfaces
+ */
+public interface test21 {
+	interface inner {
+		/**
+		 * @nooverride
+		 * @noimplement
+		 * @noinstantiate
+		 * @noextend
+		 * @return
+		 */
+		public int m1();
+		
+		/**
+		 * @nooverride
+		 * @noimplement
+		 * @noinstantiate
+		 * @noextend
+		 * @return
+		 */
+		public abstract char m2();
+		interface inner2 {
+			/**
+			 * @nooverride
+			 * @noimplement
+			 * @noinstantiate
+			 * @noextend
+			 * @return
+			 */
+			public int m1();
+			
+			/**
+			 * @nooverride
+			 * @noimplement
+			 * @noinstantiate
+			 * @noextend
+			 * @return
+			 */
+			public abstract char m2();
+		}
+	}
+}
+
+interface outer {
+	/**
+	 * @nooverride
+	 * @noimplement
+	 * @noinstantiate
+	 * @noextend
+	 * @return
+	 */
+	public int m1();
+	
+	/**
+	 * @nooverride
+	 * @noimplement
+	 * @noinstantiate
+	 * @noextend
+	 * @return
+	 */
+	public abstract char m2();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test3.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test3.java
new file mode 100644
index 0000000000..2ac33e3aa7
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test3.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noextend tag on methods in an inner interface
+ */
+public interface test3 {
+	interface inner {
+		/**
+		 * @noextend
+		 * @return
+		 */
+		public int m1();
+		
+		/**
+		 * @noextend
+		 * @return
+		 */
+		public abstract char m2();
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test4.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test4.java
new file mode 100644
index 0000000000..8b1553140e
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test4.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noextend tag on methods in outer / inner interfaces
+ */
+public interface test4 {
+	interface inner {
+		/**
+		 * @noextend
+		 * @return
+		 */
+		public int m1();
+		
+		/**
+		 * @noextend
+		 * @return
+		 */
+		public abstract char m2();
+		interface inner2 {
+			/**
+			 * @noextend
+			 * @return
+			 */
+			public int m1();
+			
+			/**
+			 * @noextend
+			 * @return
+			 */
+			public abstract char m2();
+		}
+	}
+}
+
+interface outer {
+	/**
+	 * @noextend
+	 * @return
+	 */
+	public int m1();
+	
+	/**
+	 * @noextend
+	 * @return
+	 */
+	public abstract char m2();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test5.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test5.java
new file mode 100644
index 0000000000..8a26f7395a
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test5.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test unsupported @noextend tag on methods in an interface in the default package
+ */
+public interface test5 {
+	/**
+	 * @noextend
+	 * @return
+	 */
+	public int m1();
+	
+	/**
+	 * @noextend
+	 * @return
+	 */
+	public abstract char m2();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test6.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test6.java
new file mode 100644
index 0000000000..520d763b54
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test6.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noinstantiate tag on methods in an interface
+ */
+public interface test6 {
+	/**
+	 * @noinstantiate
+	 * @return
+	 */
+	public int m1();
+	
+	/**
+	 * @noinstantiate
+	 * @return
+	 */
+	public abstract char m2();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test7.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test7.java
new file mode 100644
index 0000000000..21a3d60990
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test7.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noinstantiate tag on outer interface methods
+ */
+public interface test7 {
+	
+}
+
+interface outer {
+	/**
+	 * @noinstantiate
+	 * @return
+	 */
+	public int m1();
+	
+	/**
+	 * @noinstantiate
+	 * @return
+	 */
+	public abstract char m2();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test8.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test8.java
new file mode 100644
index 0000000000..2e6556bf5a
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test8.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noinstantiate tag on methods in an inner interface
+ */
+public interface test8 {
+	interface inner {
+		/**
+		 * @noinstantiate
+		 * @return
+		 */
+		public int m1();
+		
+		/**
+		 * @noinstantiate
+		 * @return
+		 */
+		public abstract char m2();
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test9.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test9.java
new file mode 100644
index 0000000000..4ffd0f88a4
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/interface/test9.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test unsupported @noinstantiate tag on methods in outer / inner interfaces
+ */
+public interface test9 {
+	interface inner {
+		/**
+		 * @noinstantiate
+		 * @return
+		 */
+		public int m1();
+		
+		/**
+		 * @noinstantiate
+		 * @return
+		 */
+		public abstract char m2();
+		interface inner2 {
+			/**
+			 * @noinstantiate
+			 * @return
+			 */
+			public int m1();
+			
+			/**
+			 * @noinstantiate
+			 * @return
+			 */
+			public abstract char m2();
+		}
+	}
+}
+
+interface outer {
+	/**
+	 * @noinstantiate
+	 * @return
+	 */
+	public int m1();
+	
+	/**
+	 * @noinstantiate
+	 * @return
+	 */
+	public abstract char m2();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/class/test1.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/class/test1.java
new file mode 100644
index 0000000000..2134910ea0
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/class/test1.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test supported @noreference tag on class methods
+ */
+public class test1 {
+	/**
+	 * @noreference This method is not intended to be referenced by clients.
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 * @return
+	 */
+	public int m1() {
+		return 0;
+	}
+	
+	/**
+	 * @noreference This method is not intended to be referenced by clients.
+	 * @return
+	 */
+	public final char m2() {
+		return 's';
+	}
+	
+	/**
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	protected void m3() {
+		
+	}
+	
+	/**
+	 * @noreference This method is not intended to be referenced by clients.
+	 * @return
+	 */
+	protected static Object m4() {
+		return null;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/class/test10.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/class/test10.java
new file mode 100644
index 0000000000..2b6af2ed6f
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/class/test10.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test supported @noreference tag on class methods in the default package
+ */
+public class test10 {
+	/**
+	 * Constructor
+	 * @noreference This constructor is not intended to be referenced by clients.
+	 */
+	public test10() {
+		
+	}
+	
+	/**
+	 * Constructor
+	 * @noreference This constructor is not intended to be referenced by clients.
+	 */
+	protected test10(int i) {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/class/test2.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/class/test2.java
new file mode 100644
index 0000000000..997d510af8
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/class/test2.java
@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test supported @noreference tag on outer class methods
+ */
+public class test2 {
+	
+}
+
+class outer {
+	/**
+	 * @noreference This method is not intended to be referenced by clients.
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 * @return
+	 */
+	public int m1() {
+		return 0;
+	}
+	
+	/**
+	 * @noreference This method is not intended to be referenced by clients.
+	 * @return
+	 */
+	public final char m2() {
+		return 's';
+	}
+	
+	/**
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	protected void m3() {
+		
+	}
+	
+	/**
+	 * @noreference This method is not intended to be referenced by clients.
+	 * @return
+	 */
+	protected static Object m4() {
+		return null;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/class/test3.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/class/test3.java
new file mode 100644
index 0000000000..2d7a1b0371
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/class/test3.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test supported @noreference tag on class methods
+ */
+public class test3 {
+	
+	static class inner {
+		/**
+		 * @noreference This method is not intended to be referenced by clients.
+		 * @nooverride This method is not intended to be re-implemented or extended by clients.
+		 * @return
+		 */
+		public int m1() {
+			return 0;
+		}
+		
+		/**
+		 * @noreference This method is not intended to be referenced by clients.
+		 * @return
+		 */
+		public final char m2() {
+			return 's';
+		}
+		
+		/**
+		 * @nooverride This method is not intended to be re-implemented or extended by clients.
+		 * @noreference This method is not intended to be referenced by clients.
+		 */
+		protected void m3() {
+			
+		}
+		
+		/**
+		 * @noreference This method is not intended to be referenced by clients.
+		 * @return
+		 */
+		protected static Object m4() {
+			return null;
+		}
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/class/test4.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/class/test4.java
new file mode 100644
index 0000000000..68c3038c55
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/class/test4.java
@@ -0,0 +1,112 @@
+package a.b.c;
+
+
+/**
+ * Test supported @noreference tag on methods in outer / inner classes
+ */
+public class test4 {
+	
+	static class inner {
+		/**
+		 * @noreference This method is not intended to be referenced by clients.
+		 * @nooverride This method is not intended to be re-implemented or extended by clients.
+		 * @return
+		 */
+		public int m1() {
+			return 0;
+		}
+		
+		/**
+		 * @noreference This method is not intended to be referenced by clients.
+		 * @return
+		 */
+		public final char m2() {
+			return 's';
+		}
+		
+		/**
+		 * @nooverride This method is not intended to be re-implemented or extended by clients.
+		 * @noreference This method is not intended to be referenced by clients.
+		 */
+		protected void m3() {
+			
+		}
+		
+		/**
+		 * @noreference This method is not intended to be referenced by clients.
+		 * @return
+		 */
+		protected static Object m4() {
+			return null;
+		}
+		static class inner2 {
+			/**
+			 * @noreference This method is not intended to be referenced by clients.
+			 * @nooverride This method is not intended to be re-implemented or extended by clients.
+			 * @return
+			 */
+			public int m1() {
+				return 0;
+			}
+			
+			/**
+			 * @noreference This method is not intended to be referenced by clients.
+			 * @return
+			 */
+			public final char m2() {
+				return 's';
+			}
+			
+			/**
+			 * @nooverride This method is not intended to be re-implemented or extended by clients.
+			 * @noreference This method is not intended to be referenced by clients.
+			 */
+			protected void m3() {
+				
+			}
+			
+			/**
+			 * @noreference This method is not intended to be referenced by clients.
+			 * @return
+			 */
+			protected static Object m4() {
+				return null;
+			}
+		}
+	}
+}
+
+class outer {
+	/**
+	 * @noreference This method is not intended to be referenced by clients.
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 * @return
+	 */
+	public int m1() {
+		return 0;
+	}
+	
+	/**
+	 * @noreference This method is not intended to be referenced by clients.
+	 * @return
+	 */
+	public final char m2() {
+		return 's';
+	}
+	
+	/**
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	protected void m3() {
+		
+	}
+	
+	/**
+	 * @noreference This method is not intended to be referenced by clients.
+	 * @return
+	 */
+	protected static Object m4() {
+		return null;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/class/test5.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/class/test5.java
new file mode 100644
index 0000000000..319249dea5
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/class/test5.java
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test supported @noreference tag on class methods in the default package
+ */
+public class test5 {
+	/**
+	 * @noreference This method is not intended to be referenced by clients.
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 * @return
+	 */
+	public int m1() {
+		return 0;
+	}
+	
+	/**
+	 * @noreference This method is not intended to be referenced by clients.
+	 * @return
+	 */
+	public final char m2() {
+		return 's';
+	}
+	
+	/**
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	protected void m3() {
+		
+	}
+	
+	/**
+	 * @noreference This method is not intended to be referenced by clients.
+	 * @return
+	 */
+	protected static Object m4() {
+		return null;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/class/test6.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/class/test6.java
new file mode 100644
index 0000000000..d94f04c309
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/class/test6.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test supported @noreference tag on class methods
+ */
+public class test6 {
+	/**
+	 * Constructor
+	 * @noreference This constructor is not intended to be referenced by clients.
+	 */
+	public test6() {
+		
+	}
+	
+	/**
+	 * Constructor
+	 * @noreference This constructor is not intended to be referenced by clients.
+	 */
+	protected test6(int i) {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/class/test7.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/class/test7.java
new file mode 100644
index 0000000000..ea61347bce
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/class/test7.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test supported @noreference tag on outer class methods
+ */
+public class test7 {
+	
+}
+
+class outer {
+	/**
+	 * Constructor
+	 * @noreference This constructor is not intended to be referenced by clients.
+	 */
+	public outer() {
+		
+	}
+	
+	/**
+	 * Constructor
+	 * @noreference This constructor is not intended to be referenced by clients.
+	 */
+	protected outer(int i) {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/class/test8.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/class/test8.java
new file mode 100644
index 0000000000..9207581011
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/class/test8.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test supported @noreference tag on class methods
+ */
+public class test8 {
+	class inner {
+		/**
+		 * Constructor
+		 * @noreference This constructor is not intended to be referenced by clients.
+		 */
+		public inner() {
+			
+		}
+		
+		/**
+		 * Constructor
+		 * @noreference This constructor is not intended to be referenced by clients.
+		 */
+		protected inner(int i) {
+			
+		}
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/class/test9.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/class/test9.java
new file mode 100644
index 0000000000..bae491dc28
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/class/test9.java
@@ -0,0 +1,61 @@
+package a.b.c;
+
+
+/**
+ * Test supported @noreference tag on methods in outer / inner classes
+ */
+public class test9 {
+	
+	static class inner {
+		/**
+		 * Constructor
+		 * @noreference This constructor is not intended to be referenced by clients.
+		 */
+		public inner() {
+			
+		}
+		
+		/**
+		 * Constructor
+		 * @noreference This constructor is not intended to be referenced by clients.
+		 */
+		protected inner(int i) {
+			
+		}
+		static class inner2 {
+			/**
+			 * Constructor
+			 * @noreference This constructor is not intended to be referenced by clients.
+			 */
+			public inner2() {
+				
+			}
+			
+			/**
+			 * Constructor
+			 * @noreference This constructor is not intended to be referenced by clients.
+			 */
+			protected inner2(int i) {
+				
+			}
+		}
+	}
+}
+
+class outer {
+	/**
+	 * Constructor
+	 * @noreference This constructor is not intended to be referenced by clients.
+	 */
+	public outer() {
+		
+	}
+	
+	/**
+	 * Constructor
+	 * @noreference This constructor is not intended to be referenced by clients.
+	 */
+	protected outer(int i) {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/enum/test1.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/enum/test1.java
new file mode 100644
index 0000000000..2797a72624
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/enum/test1.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test supported @noreference tag on enum methods
+ */
+public enum test1 {
+	A;
+	/**
+	 * @noreference
+	 * @return
+	 */
+	public int m1() {
+		return 0;
+	}
+	
+	/**
+	 * @noreference
+	 * @return
+	 */
+	public final char m2() {
+		return 's';
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/enum/test2.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/enum/test2.java
new file mode 100644
index 0000000000..1cb9e742ea
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/enum/test2.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test supported @noreference tag on outer enum methods
+ */
+public enum test2 {
+	
+}
+
+enum outer {
+	A;
+	/**
+	 * @noreference
+	 * @return
+	 */
+	public int m1() {
+		return 0;
+	}
+	
+	/**
+	 * @noreference
+	 * @return
+	 */
+	public final char m2() {
+		return 's';
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/enum/test3.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/enum/test3.java
new file mode 100644
index 0000000000..da12299149
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/enum/test3.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test supported @noreference tag on enum methods
+ */
+public enum test3 {
+	A;
+}
+	enum inner {
+		A;
+		/**
+		 * @noreference
+		 * @return
+		 */
+		public int m1() {
+			return 0;
+		}
+		
+		/**
+		 * @noreference
+		 * @return
+		 */
+		public final char m2() {
+			return 's';
+		}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/enum/test4.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/enum/test4.java
new file mode 100644
index 0000000000..1eedbdef4f
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/enum/test4.java
@@ -0,0 +1,64 @@
+package a.b.c;
+
+
+/**
+ * Test supported @noreference tag on methods in outer / inner enums
+ */
+public enum test4 {
+	A;
+	enum inner {
+		A;
+		/**
+		 * @noreference
+		 * @return
+		 */
+		public int m1() {
+			return 0;
+		}
+		
+		/**
+		 * @noreference
+		 * @return
+		 */
+		public final char m2() {
+			return 's';
+		}
+		enum inner2 {
+			A;
+			/**
+			 * @noreference
+			 * @return
+			 */
+			public int m1() {
+				return 0;
+			}
+			
+			/**
+			 * @noreference
+			 * @return
+			 */
+			public final char m2() {
+				return 's';
+			}
+		}
+	}
+}
+
+enum outer {
+	A;
+	/**
+	 * @noreference
+	 * @return
+	 */
+	public int m1() {
+		return 0;
+	}
+	
+	/**
+	 * @noreference
+	 * @return
+	 */
+	public final char m2() {
+		return 's';
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/enum/test5.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/enum/test5.java
new file mode 100644
index 0000000000..e2439f60cf
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/enum/test5.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test supported @noreference tag on enum methods in the default package
+ */
+public enum test5 {
+	A;
+	/**
+	 * @noreference
+	 * @return
+	 */
+	public int m1() {
+		return 0;
+	}
+	
+	/**
+	 * @noreference
+	 * @return
+	 */
+	public final char m2() {
+		return 's';
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/interface/test1.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/interface/test1.java
new file mode 100644
index 0000000000..e3fcf5a803
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/interface/test1.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test supported @noreference tag on interface methods
+ */
+public interface test1 {
+	/**
+	 * @noreference
+	 * @return
+	 */
+	public int m1();
+	
+	/**
+	 * @noreference
+	 * @return
+	 */
+	public abstract char m2();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/interface/test2.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/interface/test2.java
new file mode 100644
index 0000000000..82ff2b2565
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/interface/test2.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test supported @noreference tag on outer interface methods
+ */
+public interface test2 {
+	
+}
+
+interface outer {
+	/**
+	 * @noreference
+	 * @return
+	 */
+	public int m1();
+	
+	/**
+	 * @noreference
+	 * @return
+	 */
+	public abstract char m2();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/interface/test3.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/interface/test3.java
new file mode 100644
index 0000000000..106114592c
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/interface/test3.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package a.b.c;
+
+/**
+ * Test supported @noreference tag on interface methods
+ */
+public interface test3 {
+}
+	interface inner {
+		/**
+		 * @noreference
+		 * @return
+		 */
+		public int m1();
+		
+		/**
+		 * @noreference
+		 * @return
+		 */
+		public abstract char m2();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/interface/test4.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/interface/test4.java
new file mode 100644
index 0000000000..e0dab712f7
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/interface/test4.java
@@ -0,0 +1,48 @@
+package a.b.c;
+
+
+/**
+ * Test supported @noreference tag on methods in outer / inner interfaces
+ */
+public interface test4 {
+	interface inner {
+		/**
+		 * @noreference
+		 * @return
+		 */
+		public int m1();
+		
+		/**
+		 * @noreference
+		 * @return
+		 */
+		public abstract char m2();
+		interface inner2 {
+			/**
+			 * @noreference
+			 * @return
+			 */
+			public int m1();
+			
+			/**
+			 * @noreference
+			 * @return
+			 */
+			public abstract char m2();
+		}
+	}
+}
+
+interface outer {
+	/**
+	 * @noreference
+	 * @return
+	 */
+	public int m1();
+	
+	/**
+	 * @noreference
+	 * @return
+	 */
+	public abstract char m2();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/interface/test5.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/interface/test5.java
new file mode 100644
index 0000000000..53f8451997
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/tags/method/valid/interface/test5.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/**
+ * Test supported @noreference tag on interface methods in the default package
+ */
+public interface test5 {
+	/**
+	 * @noreference
+	 * @return
+	 */
+	public int m1();
+	
+	/**
+	 * @noreference
+	 * @return
+	 */
+	public abstract char m2();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/class/testC1.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/class/testC1.java
new file mode 100644
index 0000000000..86fa71ed40
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/class/testC1.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import c.ClassUsageClass;
+
+/**
+ * 
+ */
+public class testC1 extends ClassUsageClass {
+
+	public static class inner extends ClassUsageClass {
+		
+	}
+	
+	class inner2 extends ClassUsageClass {
+		
+	}
+}
+
+class outer extends ClassUsageClass {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/class/testC2.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/class/testC2.java
new file mode 100644
index 0000000000..9e154efda4
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/class/testC2.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import c.ClassUsageClass;
+
+/**
+ * 
+ */
+public class testC2 {
+	/**
+	 * Constructor
+	 */
+	public testC2() {
+		ClassUsageClass c = new ClassUsageClass();
+	}
+
+	public static class inner {
+		/**
+		 * Constructor
+		 */
+		public inner() {
+			ClassUsageClass c = new ClassUsageClass();
+		}
+	}
+	
+	class inner2 {
+		/**
+		 * Constructor
+		 */
+		public inner2() {
+			ClassUsageClass c = new ClassUsageClass();
+		}
+	}
+}
+
+class outer {
+	/**
+	 * Constructor
+	 */
+	public outer() {
+		ClassUsageClass c = new ClassUsageClass();
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/constructor/testCN1.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/constructor/testCN1.java
new file mode 100644
index 0000000000..8584573e53
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/constructor/testCN1.java
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import m.ConstructorUsageClass;
+
+/**
+ * 
+ */
+public class testCN1 {
+	/**
+	 * Constructor
+	 */
+	public testCN1() {
+		ConstructorUsageClass c = new ConstructorUsageClass();
+		ConstructorUsageClass c1 = new ConstructorUsageClass(1, new Object(), new char[] {});
+		ConstructorUsageClass.inner c2 = new ConstructorUsageClass.inner();
+	}
+
+	public static class inner {
+		/**
+		 * Constructor
+		 */
+		public inner() {
+			ConstructorUsageClass c = new ConstructorUsageClass();
+			ConstructorUsageClass c1 = new ConstructorUsageClass(1, new Object(), new char[] {});
+			ConstructorUsageClass.inner c2 = new ConstructorUsageClass.inner();
+		}
+	}
+	
+	class inner2 {
+		/**
+		 * Constructor
+		 */
+		public inner2() {
+			ConstructorUsageClass c = new ConstructorUsageClass();
+			ConstructorUsageClass c1 = new ConstructorUsageClass(1, new Object(), new char[] {});
+			ConstructorUsageClass.inner c2 = new ConstructorUsageClass.inner();
+		}
+	}
+}
+
+class outer {
+	/**
+	 * Constructor
+	 */
+	public outer() {
+		ConstructorUsageClass c = new ConstructorUsageClass();
+		ConstructorUsageClass c1 = new ConstructorUsageClass(1, new Object(), new char[] {});
+		ConstructorUsageClass.inner c2 = new ConstructorUsageClass.inner();
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/field/testF1.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/field/testF1.java
new file mode 100644
index 0000000000..ab45dd6b65
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/field/testF1.java
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import f.FieldUsageClass;
+
+/**
+ * Tests field usage, where the accessed field is tagged with a noreference tag
+ */
+public class testF1 {
+	
+	/**
+	 * Constructor
+	 */
+	public testF1() {
+		FieldUsageClass c = new FieldUsageClass();
+		int f1 = c.f1;
+		int f2 = FieldUsageClass.f2;
+	}
+	
+	public static class inner {
+		/**
+		 * Constructor
+		 */
+		public inner() {
+			FieldUsageClass c = new FieldUsageClass();
+			int f1 = c.f1;
+			int f2 = FieldUsageClass.f2;
+		}
+	}
+	
+	class inner2 {
+		/**
+		 * Constructor
+		 */
+		public inner2() {
+			FieldUsageClass c = new FieldUsageClass();
+			int f1 = c.f1;
+			int f2 = FieldUsageClass.f2;
+		}
+	}
+}
+class outer {
+	/**
+	 * Constructor
+	 */
+	public outer() {
+		FieldUsageClass c = new FieldUsageClass();
+		int f1 = c.f1;
+		int f2 = FieldUsageClass.f2;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/field/testF2.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/field/testF2.java
new file mode 100644
index 0000000000..2be4313d43
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/field/testF2.java
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import f.FieldUsageClass;
+
+/**
+ * Tests field usage, where the accessed field is tagged with a noreference tag
+ */
+public class testF2 {
+	
+	/**
+	 * Constructor
+	 */
+	public testF2() {
+		FieldUsageClass.inner c = new FieldUsageClass.inner();
+		int f1 = c.f1;
+		int f2 = FieldUsageClass.inner.f2;
+	}
+	
+	public static class inner {
+		/**
+		 * Constructor
+		 */
+		public inner() {
+			FieldUsageClass.inner c = new FieldUsageClass.inner();
+			int f1 = c.f1;
+			int f2 = FieldUsageClass.inner.f2;
+		}
+	}
+	
+	class inner2 {
+		/**
+		 * Constructor
+		 */
+		public inner2() {
+			FieldUsageClass.inner c = new FieldUsageClass.inner();
+			int f1 = c.f1;
+			int f2 = FieldUsageClass.inner.f2;
+		}
+	}
+}
+
+class outer {
+	/**
+	 * Constructor
+	 */
+	public outer() {
+		FieldUsageClass.inner c = new FieldUsageClass.inner();
+		int f1 = c.f1;
+		int f2 = FieldUsageClass.inner.f2;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/field/testF3.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/field/testF3.java
new file mode 100644
index 0000000000..b733ef8b5c
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/field/testF3.java
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import f.FieldUsageClass;
+
+/**
+ * Tests field usage, where the accessed field is tagged with a noreference tag
+ */
+public class testF3 {
+	
+	/**
+	 * Constructor
+	 */
+	public testF3() {
+		FieldUsageClass c = new FieldUsageClass();
+		int f3 = FieldUsageClass.f3;
+		int f4 = c.f4;
+	}
+	
+	public static class inner {
+		/**
+		 * Constructor
+		 */
+		public inner() {
+			FieldUsageClass c = new FieldUsageClass();
+			int f3 = FieldUsageClass.f3;
+			int f4 = c.f4;
+		}
+	}
+	
+	class inner2 {
+		/**
+		 * Constructor
+		 */
+		public inner2() {
+			FieldUsageClass c = new FieldUsageClass();
+			int f3 = FieldUsageClass.f3;
+			int f4 = c.f4;
+		}
+	}
+}
+
+class outer {
+	/**
+	 * Constructor
+	 */
+	public outer() {
+		FieldUsageClass c = new FieldUsageClass();
+		int f3 = FieldUsageClass.f3;
+		int f4 = c.f4;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/field/testF4.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/field/testF4.java
new file mode 100644
index 0000000000..ee91e19956
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/field/testF4.java
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import f.FieldUsageClass;
+
+/**
+ * Tests field usage, where the accessed field is tagged with a noreference tag
+ */
+public class testF4 {
+	
+	/**
+	 * Constructor
+	 */
+	public testF4() {
+		FieldUsageClass.inner c = new FieldUsageClass.inner();
+		int f3 = FieldUsageClass.inner.f3;
+		int f4 = c.f4;
+	}
+	
+	public static class inner {
+		/**
+		 * Constructor
+		 */
+		public inner() {
+			FieldUsageClass.inner c = new FieldUsageClass.inner();
+			int f3 = FieldUsageClass.inner.f3;
+			int f4 = c.f4;
+		}
+	}
+	
+	class inner2 {
+		/**
+		 * Constructor
+		 */
+		public inner2() {
+			FieldUsageClass.inner c = new FieldUsageClass.inner();
+			int f3 = FieldUsageClass.inner.f3;
+			int f4 = c.f4;
+		}
+	}
+}
+
+class outer {
+	/**
+	 * Constructor
+	 */
+	public outer() {
+		FieldUsageClass.inner c = new FieldUsageClass.inner();
+		int f3 = FieldUsageClass.inner.f3;
+		int f4 = c.f4;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/field/testF5.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/field/testF5.java
new file mode 100644
index 0000000000..8b4dfa9b34
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/field/testF5.java
@@ -0,0 +1,65 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import f.FieldUsageInterface;
+
+
+/**
+ * 
+ */
+public class testF5 {
+	
+	int f1 = FieldUsageInterface.f1;
+	int f2 = FieldUsageInterface.f2;
+	int f3 = FieldUsageInterface.f3;
+	int f4 = FieldUsageInterface.f4;
+	int f5 = FieldUsageInterface.f5;
+	
+	public static class inner {
+		/**
+		 * Constructor
+		 */
+		public inner() {
+			int f1 = FieldUsageInterface.f1;
+			int f2 = FieldUsageInterface.f2;
+			int f3 = FieldUsageInterface.f3;
+			int f4 = FieldUsageInterface.f4;
+			int f5 = FieldUsageInterface.f5;
+		}
+	}
+	
+	class inner2 {
+		/**
+		 * Constructor
+		 */
+		public inner2() {
+			int f1 = FieldUsageInterface.f1;
+			int f2 = FieldUsageInterface.f2;
+			int f3 = FieldUsageInterface.f3;
+			int f4 = FieldUsageInterface.f4;
+			int f5 = FieldUsageInterface.f5;
+		}
+	}
+}
+
+class outer {
+	/**
+	 * Constructor
+	 */
+	public outer() {
+		int f1 = FieldUsageInterface.f1;
+		int f2 = FieldUsageInterface.f2;
+		int f3 = FieldUsageInterface.f3;
+		int f4 = FieldUsageInterface.f4;
+		int f5 = FieldUsageInterface.f5;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/field/testF6.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/field/testF6.java
new file mode 100644
index 0000000000..9cbbb4f6ba
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/field/testF6.java
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import f.FieldUsageEnum;
+
+
+/**
+ * Tests the usage of restricted enum fields
+ */
+@SuppressWarnings({"unused", "hiding"})
+public class testF6 {
+	
+	int f2 = FieldUsageEnum.A.f2;
+	int f3 = FieldUsageEnum.f3;
+	Object o = FieldUsageEnum.A;
+	
+	public static class inner {
+		/**
+		 * Constructor
+		 */
+		public inner() {
+			int f2 = FieldUsageEnum.A.f2;
+			int f3 = FieldUsageEnum.f3;
+			Object o = FieldUsageEnum.A;
+		}
+	}
+	
+	class inner2 {
+		/**
+		 * Constructor
+		 */
+		public inner2() {
+			int f2 = FieldUsageEnum.A.f2;
+			int f3 = FieldUsageEnum.f3;
+			Object o = FieldUsageEnum.A;
+		}
+	}
+}
+
+@SuppressWarnings({"unused"})
+class outer {
+	/**
+	 * Constructor
+	 */
+	public outer() {
+		int f2 = FieldUsageEnum.A.f2;
+		int f3 = FieldUsageEnum.f3;
+		Object o = FieldUsageEnum.A;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/field/testF7.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/field/testF7.java
new file mode 100644
index 0000000000..5e8fe585b6
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/field/testF7.java
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import f.FieldUsageEnum;
+
+
+/**
+ * Tests the usage of restricted enum fields
+ */
+@SuppressWarnings({"unused", "hiding"})
+public class testF7 {
+	
+	int f4 = FieldUsageEnum.A.f4;
+	int f5 = FieldUsageEnum.f5;
+	Object o = FieldUsageEnum.A;
+	
+	public static class inner {
+		/**
+		 * Constructor
+		 */
+		public inner() {
+			int f4 = FieldUsageEnum.A.f4;
+			int f5 = FieldUsageEnum.f5;
+			Object o = FieldUsageEnum.A;
+		}
+	}
+	
+	class inner2 {
+		/**
+		 * Constructor
+		 */
+		public inner2() {
+			int f4 = FieldUsageEnum.A.f4;
+			int f5 = FieldUsageEnum.f5;
+			Object o = FieldUsageEnum.A;
+		}
+	}
+}
+
+@SuppressWarnings({"unused"})
+class outer {
+	/**
+	 * Constructor
+	 */
+	public outer() {
+		int f4 = FieldUsageEnum.A.f4;
+		int f5 = FieldUsageEnum.f5;
+		Object o = FieldUsageEnum.A;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/interface/testI1.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/interface/testI1.java
new file mode 100644
index 0000000000..285ceae72f
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/interface/testI1.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import i.InterfaceUsageInterface;
+
+/**
+ * 
+ */
+public interface testI1 extends InterfaceUsageInterface {
+
+	interface inner extends InterfaceUsageInterface.Iinner {
+		
+	}
+}
+
+interface Iouter extends InterfaceUsageInterface.Iinner {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/interface/testI2.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/interface/testI2.java
new file mode 100644
index 0000000000..3b5dd497e7
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/interface/testI2.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import i.InterfaceUsageInterface;
+
+/**
+ * 
+ */
+public class testI2 implements InterfaceUsageInterface {
+
+	public static class inner implements InterfaceUsageInterface.Iinner {
+		
+	}
+}
+
+class outer implements InterfaceUsageInterface {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/method/testCN1.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/method/testCN1.java
new file mode 100644
index 0000000000..8584573e53
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/method/testCN1.java
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import m.ConstructorUsageClass;
+
+/**
+ * 
+ */
+public class testCN1 {
+	/**
+	 * Constructor
+	 */
+	public testCN1() {
+		ConstructorUsageClass c = new ConstructorUsageClass();
+		ConstructorUsageClass c1 = new ConstructorUsageClass(1, new Object(), new char[] {});
+		ConstructorUsageClass.inner c2 = new ConstructorUsageClass.inner();
+	}
+
+	public static class inner {
+		/**
+		 * Constructor
+		 */
+		public inner() {
+			ConstructorUsageClass c = new ConstructorUsageClass();
+			ConstructorUsageClass c1 = new ConstructorUsageClass(1, new Object(), new char[] {});
+			ConstructorUsageClass.inner c2 = new ConstructorUsageClass.inner();
+		}
+	}
+	
+	class inner2 {
+		/**
+		 * Constructor
+		 */
+		public inner2() {
+			ConstructorUsageClass c = new ConstructorUsageClass();
+			ConstructorUsageClass c1 = new ConstructorUsageClass(1, new Object(), new char[] {});
+			ConstructorUsageClass.inner c2 = new ConstructorUsageClass.inner();
+		}
+	}
+}
+
+class outer {
+	/**
+	 * Constructor
+	 */
+	public outer() {
+		ConstructorUsageClass c = new ConstructorUsageClass();
+		ConstructorUsageClass c1 = new ConstructorUsageClass(1, new Object(), new char[] {});
+		ConstructorUsageClass.inner c2 = new ConstructorUsageClass.inner();
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/method/testM1.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/method/testM1.java
new file mode 100644
index 0000000000..27221406cb
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/method/testM1.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import m.MethodUsageClass;
+
+/**
+ * 
+ */
+public class testM1 extends MethodUsageClass {
+	
+	public static class inner {
+		/**
+		 * Constructor
+		 */
+		public inner() {
+			MethodUsageClass c = new MethodUsageClass();
+			c.m1();
+			c.m3();
+		}
+	}
+	
+	class inner2 {
+		/**
+		 * Constructor
+		 */
+		public inner2() {
+			MethodUsageClass c = new MethodUsageClass();
+			c.m1();
+			c.m3();
+		}
+	}
+}
+
+class outer {
+	/**
+	 * Constructor
+	 */
+	public outer() {
+		MethodUsageClass c = new MethodUsageClass();
+		c.m1();
+		c.m3();
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/method/testM2.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/method/testM2.java
new file mode 100644
index 0000000000..c860294a66
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/method/testM2.java
@@ -0,0 +1,56 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import m.MethodUsageClass;
+
+/**
+ * 
+ */
+public class testM2 extends MethodUsageClass {
+	/**
+	 * @see x.y.z.MethodUsageClass#m2()
+	 */
+	@Override
+	public void m2() {
+		super.m2();
+	}
+	
+	public static class inner extends MethodUsageClass{
+		/**
+		 * @see x.y.z.MethodUsageClass#m2()
+		 */
+		@Override
+		public void m2() {
+			super.m2();
+		}
+	}
+	
+	class inner2 extends MethodUsageClass {
+		/**
+		 * @see x.y.z.MethodUsageClass#m2()
+		 */
+		@Override
+		public void m2() {
+			super.m2();
+		}
+	}
+}
+
+class outer extends MethodUsageClass {
+	/**
+	 * @see x.y.z.MethodUsageClass#m2()
+	 */
+	@Override
+	public void m2() {
+		super.m2();
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/method/testM3.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/method/testM3.java
new file mode 100644
index 0000000000..5c1ef86c1a
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/method/testM3.java
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import m.MethodUsageClass;
+
+/**
+ * 
+ */
+public class testM3 extends MethodUsageClass {
+	/**
+	 * Constructor
+	 */
+	public testM3() {
+		MethodUsageClass.m4();
+		MethodUsageClass.m5();
+		MethodUsageClass.m6();
+	}
+	
+	public static class inner {
+		/**
+		 * Constructor
+		 */
+		public inner() {
+			MethodUsageClass.m4();
+			MethodUsageClass.m5();
+			MethodUsageClass.m6();
+		}
+	}
+	
+	class inner2 {
+		/**
+		 * Constructor
+		 */
+		public inner2() {
+			MethodUsageClass.m4();
+			MethodUsageClass.m5();
+			MethodUsageClass.m6();
+		}
+	}
+}
+
+class outer {
+	/**
+	 * Constructor
+	 */
+	public outer() {
+		MethodUsageClass.m4();
+		MethodUsageClass.m5();
+		MethodUsageClass.m6();
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/method/testM4.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/method/testM4.java
new file mode 100644
index 0000000000..20b8d6717b
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/method/testM4.java
@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import m.MethodUsageImpl;
+import m.MethodUsageInterface;
+
+/**
+ * 
+ */
+public class testM4 {
+	
+	public static class inner {
+		/**
+		 * Constructor
+		 */
+		public inner() {
+			MethodUsageInterface i = new MethodUsageImpl();
+			i.m1();
+			i.m3();
+		}
+	}
+	
+	class inner2 {
+		/**
+		 * Constructor
+		 */
+		public inner2() {
+			MethodUsageInterface i = new MethodUsageImpl();
+			i.m1();
+			i.m3();
+		}
+	}
+}
+
+class outer {
+	/**
+	 * Constructor
+	 */
+	public outer() {
+		MethodUsageInterface i = new MethodUsageImpl();
+		i.m1();
+		i.m3();
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/method/testM5.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/method/testM5.java
new file mode 100644
index 0000000000..e68d46f092
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usage/method/testM5.java
@@ -0,0 +1,55 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package x.y.z;
+
+import m.MethodUsageEnum;
+
+/**
+ * 
+ */
+public class testM5 {
+	
+	public static class inner {
+		/**
+		 * Constructor
+		 */
+		public inner() {
+			MethodUsageEnum.A.m1();
+			MethodUsageEnum.A.m2();
+			MethodUsageEnum.A.m3();
+			MethodUsageEnum.m4();
+		}
+	}
+	
+	class inner2 {
+		/**
+		 * Constructor
+		 */
+		public inner2() {
+			MethodUsageEnum.A.m1();
+			MethodUsageEnum.A.m2();
+			MethodUsageEnum.A.m3();
+			MethodUsageEnum.m4();
+		}
+	}
+}
+
+class outer {
+	/**
+	 * Constructor
+	 */
+	public outer() {
+		MethodUsageEnum.A.m1();
+		MethodUsageEnum.A.m2();
+		MethodUsageEnum.A.m3();
+		MethodUsageEnum.m4();
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/.classpath b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/.classpath
new file mode 100644
index 0000000000..64c5e31b7a
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/.project b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/.project
new file mode 100644
index 0000000000..dc6af0b56e
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>refproject</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+	</natures>
+</projectDescription>
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..56c03ebfa9
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
+#Wed Sep 10 10:52:35 CDT 2008
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..bfb7e76953
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/META-INF/MANIFEST.MF
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: refproject
+Bundle-SymbolicName: refproject
+Bundle-Version: 1.0.0
+Export-Package: c,
+ f,
+ i,
+ m
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/build.properties b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/build.properties
new file mode 100644
index 0000000000..72b6b36482
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/build.properties
@@ -0,0 +1,3 @@
+source.. = src/
+bin.includes = META-INF/,\
+               .,\
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/src/c/ClassUsageClass.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/src/c/ClassUsageClass.java
new file mode 100644
index 0000000000..666e4ccc4a
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/src/c/ClassUsageClass.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package c;
+
+/**
+ * @noextend This class is not intended to be subclassed by clients.
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ */
+public class ClassUsageClass {
+
+	/**
+	 * @noextend This class is not intended to be subclassed by clients.
+	 * @noinstantiate This class is not intended to be instantiated by clients.
+	 */
+	public static class inner {
+		
+	}
+	
+}
+
+/**
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ * @noextend This class is not intended to be subclassed by clients.
+ */
+class outer {
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/src/f/FieldUsageClass.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/src/f/FieldUsageClass.java
new file mode 100644
index 0000000000..dcee00a7dc
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/src/f/FieldUsageClass.java
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package f;
+
+/**
+ * 
+ */
+public class FieldUsageClass {
+	
+	/**
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
+	public int f1 = -1;
+	
+	/**
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
+	public static int f2 = 0;
+	
+	/**
+	 * @noreference
+	 */
+	public static final int f3 = 1;
+	
+	/**
+	 * @noreference
+	 */
+	public final int f4 = 2;
+	
+	public static class inner {
+		/**
+		 * @noreference This field is not intended to be referenced by clients.
+		 */
+		public int f1 = -1;
+		
+		/**
+		 * @noreference This field is not intended to be referenced by clients.
+		 */
+		public static int f2 = 0;
+		
+		/**
+		 * @noreference
+		 */
+		public static final int f3 = 1;
+		
+		/**
+		 * @noreference
+		 */
+		public final int f4 = 2;
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/src/f/FieldUsageEnum.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/src/f/FieldUsageEnum.java
new file mode 100644
index 0000000000..8a37efd57d
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/src/f/FieldUsageEnum.java
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package f;
+
+/**
+ * 
+ */
+public enum FieldUsageEnum {
+
+	/**
+	 * @noreference
+	 */
+	A;
+	
+	/**
+	 * @noreference This enum field is not intended to be referenced by clients.
+	 */
+	int f1 = -1;
+	
+	/**
+	 * @noreference This enum field is not intended to be referenced by clients.
+	 */
+	public int f2 = 0;
+	
+	/**
+	 * @noreference This enum field is not intended to be referenced by clients.
+	 */
+	public static int f3 = 1;
+	
+	/**
+	 * @noreference
+	 */
+	public final int f4 = 2;
+	
+	/**
+	 * @noreference
+	 */
+	public static final int f5 = 3;
+	
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/src/f/FieldUsageInterface.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/src/f/FieldUsageInterface.java
new file mode 100644
index 0000000000..f56c37f6af
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/src/f/FieldUsageInterface.java
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package f;
+
+/**
+ * 
+ */
+public interface FieldUsageInterface {
+
+	/**
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
+	int f1 = -1;
+	
+	/**
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
+	public int f2 = 0; 
+	
+	/**
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
+	public static int f3 = 1;
+	
+	/**
+	 * @noreference
+	 */
+	public final int f4 = 2;
+	
+	/**
+	 * @noreference
+	 */
+	public static final int f5 = 3;
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/src/i/InterfaceUsageInterface.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/src/i/InterfaceUsageInterface.java
new file mode 100644
index 0000000000..42c21193d1
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/src/i/InterfaceUsageInterface.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package i;
+
+/**
+ * @noimplement This interface is not intended to be implemented by clients.
+ */
+public interface InterfaceUsageInterface {
+
+	/**
+	 * @noimplement This interface is not intended to be implemented by clients.
+	 */
+	interface Iinner {
+		
+	}
+}
\ No newline at end of file
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/src/m/ConstructorUsageClass.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/src/m/ConstructorUsageClass.java
new file mode 100644
index 0000000000..13128ab3b9
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/src/m/ConstructorUsageClass.java
@@ -0,0 +1,90 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package m;
+
+/**
+ * 
+ */
+public class ConstructorUsageClass {
+
+	/**
+	 * Constructor
+	 * @noreference This constructor is not intended to be referenced by clients.
+	 */
+	public ConstructorUsageClass() {
+	}
+	/**
+	 * Constructor
+	 * @param i
+	 * @param o
+	 * @param chars
+	 * @noreference This constructor is not intended to be referenced by clients.
+	 */
+	public ConstructorUsageClass(int i, Object o, char[] chars) {
+	}
+	public static class inner {
+		/**
+		 * Constructor
+		 * @noreference This constructor is not intended to be referenced by clients.
+		 */
+		public inner() {
+		}
+		/**
+		 * Constructor
+		 * @param i
+		 * @param o
+		 * @param chars
+		 * @noreference This constructor is not intended to be referenced by clients.
+		 */
+		public inner(int i, Object o, char[] chars){
+			
+		}
+	}
+	
+	class inner2 {
+		/**
+		 * Constructor
+		 * @noreference This constructor is not intended to be referenced by clients.
+		 */
+		public inner2() {
+		}
+		
+		/**
+		 * Constructor
+		 * @param i
+		 * @param o
+		 * @param chars
+		 * @noreference This constructor is not intended to be referenced by clients.
+		 */
+		public inner2(int i, Object o, char[] chars) {
+			
+		}
+	}
+}
+
+class outer2 {
+	/**
+	 * Constructor
+	 * @noreference This constructor is not intended to be referenced by clients.
+	 */
+	public outer2() {
+	}
+	/**
+	 * Constructor
+	 * @param i
+	 * @param o
+	 * @param chars
+	 * @noreference This constructor is not intended to be referenced by clients.
+	 */
+	public outer2(int i, Object o, char[] chars) {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/src/m/MethodUsageClass.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/src/m/MethodUsageClass.java
new file mode 100644
index 0000000000..4602754f89
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/src/m/MethodUsageClass.java
@@ -0,0 +1,178 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package m;
+
+/**
+ * 
+ */
+public class MethodUsageClass {
+
+	/**
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	public void m1() {
+		
+	}
+	
+	/**
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 */
+	public void m2() {
+		
+	}
+	
+	/**
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	public void m3() {
+		
+	}
+	
+	/**
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	public static void m4() {
+		
+	}
+	
+	/**
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 */
+	public static void m5() {
+		
+	}
+	
+	/**
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	public static void m6() {
+		
+	}
+	
+	public static class inner {
+		/**
+		 * @noreference This method is not intended to be referenced by clients.
+		 */
+		public void m1() {
+			
+		}
+		
+		/**
+		 * @nooverride This method is not intended to be re-implemented or extended by clients.
+		 */
+		public void m2() {
+			
+		}
+		
+		/**
+		 * @nooverride This method is not intended to be re-implemented or extended by clients.
+		 * @noreference This method is not intended to be referenced by clients.
+		 */
+		public void m3() {
+			
+		}
+		
+		/**
+		 * @noreference This method is not intended to be referenced by clients.
+		 */
+		public static void m4() {
+			
+		}
+		
+		/**
+		 * @nooverride This method is not intended to be re-implemented or extended by clients.
+		 */
+		public static void m5() {
+			
+		}
+		
+		/**
+		 * @nooverride This method is not intended to be re-implemented or extended by clients.
+		 * @noreference This method is not intended to be referenced by clients.
+		 */
+		public static void m6() {
+			
+		}
+	}
+	
+	class inner2 {
+		/**
+		 * @noreference This method is not intended to be referenced by clients.
+		 */
+		public void m1() {
+			
+		}
+		
+		/**
+		 * @nooverride This method is not intended to be re-implemented or extended by clients.
+		 */
+		public void m2() {
+			
+		}
+		
+		/**
+		 * @nooverride This method is not intended to be re-implemented or extended by clients.
+		 * @noreference This method is not intended to be referenced by clients.
+		 */
+		public void m3() {
+			
+		}
+	}
+}
+
+class outer {
+	
+	/**
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	public void m1() {
+		
+	}
+	
+	/**
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 */
+	public void m2() {
+		
+	}
+	
+	/**
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	public void m3() {
+		
+	}
+	
+	/**
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	public static void m4() {
+		
+	}
+	
+	/**
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 */
+	public static void m5() {
+		
+	}
+	
+	/**
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	public static void m6() {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/src/m/MethodUsageEnum.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/src/m/MethodUsageEnum.java
new file mode 100644
index 0000000000..9c1f0e2389
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/src/m/MethodUsageEnum.java
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package m;
+
+/**
+ * 
+ */
+public enum MethodUsageEnum {
+
+	A;
+	
+	/**
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	public void m1() {
+		
+	}
+	
+	/**
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 */
+	public void m2() {
+		
+	}
+	
+	/**
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	public void m3() {
+		
+	}
+	
+	/**
+	 * @noreference This enum method is not intended to be referenced by clients.
+	 */
+	public static void m4() {
+		
+	}
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/src/m/MethodUsageImpl.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/src/m/MethodUsageImpl.java
new file mode 100644
index 0000000000..dd30f46d0e
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/src/m/MethodUsageImpl.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package m;
+
+/**
+ * 
+ */
+public class MethodUsageImpl implements MethodUsageInterface {
+
+	/**
+	 * @see x.y.z.MethodUsageInterface#m1()
+	 */
+	public void m1() {
+	}
+
+	/**
+	 * @see x.y.z.MethodUsageInterface#m2()
+	 */
+	public void m2() {
+	}
+
+	/**
+	 * @see x.y.z.MethodUsageInterface#m3()
+	 */
+	public void m3() {
+	}
+
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/src/m/MethodUsageInterface.java b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/src/m/MethodUsageInterface.java
new file mode 100644
index 0000000000..6625bfb58d
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/refproject/src/m/MethodUsageInterface.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package m;
+
+/**
+ * 
+ */
+public interface MethodUsageInterface {
+
+	/**
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	public void m1();
+	
+	/**
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 */
+	public void m2();
+	
+	/**
+	 * @nooverride This method is not intended to be re-implemented or extended by clients.
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	public void m3();
+}
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/usagetests/.classpath b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/usagetests/.classpath
new file mode 100644
index 0000000000..c83506765b
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/usagetests/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/usagetests/.project b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/usagetests/.project
new file mode 100644
index 0000000000..78215d566c
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/usagetests/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>usagetests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+	</natures>
+</projectDescription>
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/usagetests/.settings/org.eclipse.jdt.core.prefs b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/usagetests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..34a34a94e4
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/usagetests/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
+#Wed Sep 10 10:50:09 CDT 2008
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/usagetests/META-INF/MANIFEST.MF b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/usagetests/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..9f752864c6
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/usagetests/META-INF/MANIFEST.MF
@@ -0,0 +1,7 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: usagetests
+Bundle-SymbolicName: usagetests
+Bundle-Version: 1.0.0
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: refproject;bundle-version="1.0.0"
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/usagetests/build.properties b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/usagetests/build.properties
new file mode 100644
index 0000000000..34d2e4d2da
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/usagetests/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/usagetests/src/x/y/z/Dummy.txt b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/usagetests/src/x/y/z/Dummy.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/apitools/org.eclipse.pde.api.tools.tests/test-builder/usageprojects/usagetests/src/x/y/z/Dummy.txt
diff --git a/apitools/org.eclipse.pde.api.tools.tests/test.xml b/apitools/org.eclipse.pde.api.tools.tests/test.xml
index f9797c3eeb..f042a42fda 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/test.xml
+++ b/apitools/org.eclipse.pde.api.tools.tests/test.xml
@@ -21,7 +21,7 @@
     </delete>
   </target>
 
-  <!-- This target defines the tests that need to be run. -->
+  <!-- This target defines the regression tests that need to be run. -->
   <target name="suite">
     <!-- Api Tools Plugin test suite -->
     <property name="api-tools-plugins-folder" 
@@ -49,6 +49,22 @@
       <property name="vmargs" value="-DrequiredBundles=${plugin-dir}"/>
     </ant>
   </target>
+	
+  <!-- This target defines the performance tests that need to be run. -->
+  <target name="perfsuite">
+    <!-- Api Tools Performance test suite -->
+    <property name="api-tools-plugins-folder" 
+              value="${eclipse-home}/api_tools_plugins_folder"/>
+    <delete dir="${jdt-model-folder}" quiet="true"/>
+    <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
+      <!-- Use a subdir 'data' so that the JCL jars are put in jdt-model-folder and are deleted at the end of the tests. -->
+      <property name="data-dir" value="${api-tools-plugins-folder}/data"/>
+      <property name="plugin-name" value="${plugin-name}"/>
+      <property name="classname" 
+                value="org.eclipse.pde.api.tools.tests.ApiToolsPerformanceTestSuite"/>
+        <property name="vmargs" value="-Xmx300M" />
+    </ant>
+  </target>  	
 
   <!-- This target holds code to cleanup the testing environment after -->
   <!-- after all of the tests have been run. You can use this target to -->
@@ -66,7 +82,11 @@
   </target>
 
   <!-- This target runs the performance test suites. -->
-  <target name="performance">
+  <target name="performance" depends="init,perfsuite,cleanup">
+    <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
+      <property name="includes" value="org*.xml"/>
+      <property name="output-file" value="${plugin-name}.xml"/>
+    </ant>
   </target>
 
 </project>