Bug 265796

4 files changed, 42 insertions, 4 deletions

diff --git a/launch/org.eclipse.cdt.launch/.project b/launch/org.eclipse.cdt.launch/.project
index b39fb88039a..4c2c56abaa3 100644
--- a/launch/org.eclipse.cdt.launch/.project
+++ b/launch/org.eclipse.cdt.launch/.project
@@ -20,9 +20,15 @@
 			<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/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF b/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF
index 9e6c26d08a1..b3d93fd1612 100644
--- a/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF
+++ b/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.launch; singleton:=true
-Bundle-Version: 5.0.100.qualifier
+Bundle-Version: 6.0.0.qualifier
 Bundle-Activator: org.eclipse.cdt.launch.internal.ui.LaunchUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.cdt.launch,
- org.eclipse.cdt.launch.internal,
- org.eclipse.cdt.launch.internal.ui,
+ org.eclipse.cdt.launch.internal;x-internal:=true,
+ org.eclipse.cdt.launch.internal.ui;x-internal:=true,
  org.eclipse.cdt.launch.ui
 Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.core.expressions;bundle-version="[3.2.0,4.0.0)",
@@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.cdt.core;bundle-version="[5.0.0,6.0.0)",
  org.eclipse.cdt.ui;bundle-version="[5.0.0,6.0.0)",
  org.eclipse.cdt.debug.core;bundle-version="[6.0.0,7.0.0)",
- org.eclipse.cdt.debug.ui;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.cdt.debug.ui;bundle-version="[6.0.0,7.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.core.variables;bundle-version="[3.1.100,4.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java
index abec41ee539..43e7508c9cf 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/AbstractCLaunchDelegate.java
@@ -98,6 +98,7 @@ abstract public class AbstractCLaunchDelegate extends LaunchConfigurationDelegat
 	 * @exception CoreException
 	 *                if unable to retrieve the attribute
 	 */
+	@Deprecated
 	public File getWorkingDir(ILaunchConfiguration configuration) throws CoreException {
 		return getWorkingDirectory(configuration);
 	}
@@ -209,6 +210,7 @@ abstract public class AbstractCLaunchDelegate extends LaunchConfigurationDelegat
 	 * @throws CoreException
 	 * @deprecated
 	 */
+	@Deprecated
 	protected void setSourceLocator(ILaunch launch, ILaunchConfiguration config) throws CoreException {
 		setDefaultSourceLocator(launch, config);
 	}
@@ -310,6 +312,7 @@ abstract public class AbstractCLaunchDelegate extends LaunchConfigurationDelegat
 	/**
 	 * @deprecated
 	 */
+	@Deprecated
 	protected String renderDebuggerProcessLabel() {
 		String format = "{0} ({1})"; //$NON-NLS-1$
 		String timestamp = DateFormat.getInstance().format(new Date(System.currentTimeMillis()));
@@ -324,6 +327,7 @@ abstract public class AbstractCLaunchDelegate extends LaunchConfigurationDelegat
 	 * @throws CoreException
 	 * @deprecated Use <code>verifyProgramFile</code> instead.
 	 */
+	@Deprecated
 	protected IFile getProgramFile(ILaunchConfiguration config) throws CoreException {
 		ICProject cproject = verifyCProject(config);
 		String fileName = getProgramName(config);
@@ -535,6 +539,7 @@ abstract public class AbstractCLaunchDelegate extends LaunchConfigurationDelegat
 	 * @throws CoreException
 	 *             if an exception occurrs while building
 	 */
+	@Override
 	public boolean buildForLaunch(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException {
 		//This matches the old code, but I don't know that it is the right behaviour.
 		//We should be building the local project as well, not just the ordered projects
@@ -605,6 +610,7 @@ abstract public class AbstractCLaunchDelegate extends LaunchConfigurationDelegat
 	 * @throws CoreException
 	 *             if an exception occurs while checking for compile errors.
 	 */
+	@Override
 	public boolean finalLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException {
 		boolean continueLaunch = true;
 		if(orderedProjects == null) {
@@ -681,6 +687,7 @@ abstract public class AbstractCLaunchDelegate extends LaunchConfigurationDelegat
 	 * @param proj
 	 *            The project to search
 	 * @return true if compile errors exist, otherwise false
+	 * @since 6.0
 	 */
 	protected boolean existsErrors(IProject proj) throws CoreException {
 		IMarker[] markers = proj.findMarkers(ICModelMarker.C_MODEL_PROBLEM_MARKER, true, IResource.DEPTH_INFINITE);
@@ -702,6 +709,7 @@ abstract public class AbstractCLaunchDelegate extends LaunchConfigurationDelegat
 	 * @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate2#preLaunchCheck(org.eclipse.debug.core.ILaunchConfiguration,
 	 *      java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
 	 */
+	@Override
 	public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException {
 		if(monitor == null) {
 			monitor = new NullProgressMonitor();
@@ -820,6 +828,7 @@ abstract public class AbstractCLaunchDelegate extends LaunchConfigurationDelegat
 	 * name=value
 	 * @deprecated
 	 */
+	@Deprecated
 	protected String[] getEnvironmentArray(ILaunchConfiguration config) {
 		Map env = null;
 		try {
@@ -844,6 +853,7 @@ abstract public class AbstractCLaunchDelegate extends LaunchConfigurationDelegat
 	 * does not include the default environment of the target.
 	 * @deprecated
 	 */
+	@Deprecated
 	protected Properties getEnvironmentProperty(ILaunchConfiguration config) {
 		Properties prop = new Properties();
 		Map env = null;
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java
index 2acaecaf41e..b9d80510b63 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java
@@ -90,6 +90,9 @@ public class CMainTab extends CLaunchConfigurationTab {
 	protected Label fProgLabel;
 	protected Text fProgText;
 	protected Button fSearchButton;
+	/**
+	 * @since 6.0
+	 */
 	protected Combo fBuildConfigCombo;
 
 	private final boolean fWantsTerminalOption;
@@ -142,6 +145,9 @@ public class CMainTab extends CLaunchConfigurationTab {
 		LaunchUIPlugin.setDialogShell(parent.getShell());
 	}
 
+	/**
+	 * @since 6.0
+	 */
 	protected void createProjectGroup(Composite parent, int colSpan) {
 		Composite projComp = new Composite(parent, SWT.NONE);
 		GridLayout projLayout = new GridLayout();
@@ -173,6 +179,7 @@ public class CMainTab extends CLaunchConfigurationTab {
 		fProjButton = createPushButton(projComp, LaunchMessages.getString("Launch.common.Browse_1"), null); //$NON-NLS-1$
 		fProjButton.addSelectionListener(new SelectionAdapter() {
 
+			@Override
 			public void widgetSelected(SelectionEvent evt) {
 				handleProjectButtonSelected();
 				updateLaunchConfigurationDialog();
@@ -180,6 +187,9 @@ public class CMainTab extends CLaunchConfigurationTab {
 		});
 	}
 
+	/**
+	 * @since 6.0
+	 */
 	protected void updateBuildConfigCombo(String selectedConfigID) {
 		fBuildConfigCombo.removeAll();
 		fBuildConfigCombo.add(LaunchMessages.getString("CMainTab.Use_Active")); //$NON-NLS-1$
@@ -208,6 +218,9 @@ public class CMainTab extends CLaunchConfigurationTab {
 		
 	}
 
+	/**
+	 * @since 6.0
+	 */
 	protected void createBuildConfigCombo(Composite parent, int colspan) {
 		Composite comboComp = new Composite(parent, SWT.NONE);
 		GridLayout layout = new GridLayout(2, false);
@@ -256,6 +269,7 @@ public class CMainTab extends CLaunchConfigurationTab {
 
 		fSearchButton = createPushButton(mainComp, LaunchMessages.getString("CMainTab.Search..."), null); //$NON-NLS-1$
 		fSearchButton.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent evt) {
 				handleSearchButtonSelected();
 				updateLaunchConfigurationDialog();
@@ -265,6 +279,7 @@ public class CMainTab extends CLaunchConfigurationTab {
 		Button fBrowseForBinaryButton;
 		fBrowseForBinaryButton = createPushButton(mainComp, LaunchMessages.getString("Launch.common.Browse_2"), null); //$NON-NLS-1$
 		fBrowseForBinaryButton.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent evt) {
 				handleBinaryBrowseButtonSelected();
 				updateLaunchConfigurationDialog();
@@ -290,6 +305,7 @@ public class CMainTab extends CLaunchConfigurationTab {
 		fTerminalButton = createCheckButton(mainComp, LaunchMessages.getString("CMainTab.UseTerminal")); //$NON-NLS-1$
 		fTerminalButton.addSelectionListener(new SelectionAdapter() {
 
+			@Override
 			public void widgetSelected(SelectionEvent evt) {
 				updateLaunchConfigurationDialog();
 			}
@@ -376,6 +392,7 @@ public class CMainTab extends CLaunchConfigurationTab {
 
 		ILabelProvider programLabelProvider = new CElementLabelProvider() {
 
+			@Override
 			public String getText(Object element) {
 				if (element instanceof IBinary) {
 					IBinary bin = (IBinary)element;
@@ -386,6 +403,7 @@ public class CMainTab extends CLaunchConfigurationTab {
 				return super.getText(element);
 			}
 
+			@Override
 			public Image getImage(Object element) {
 				if (! (element instanceof ICElement)) {
 					return super.getImage(element);
@@ -405,6 +423,7 @@ public class CMainTab extends CLaunchConfigurationTab {
 
 		ILabelProvider qualifierLabelProvider = new CElementLabelProvider() {
 
+			@Override
 			public String getText(Object element) {
 				if (element instanceof IBinary) {
 					IBinary bin = (IBinary)element;
@@ -568,6 +587,7 @@ public class CMainTab extends CLaunchConfigurationTab {
 	 * 
 	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#isValid(org.eclipse.debug.core.ILaunchConfiguration)
 	 */
+	@Override
 	public boolean isValid(ILaunchConfiguration config) {
 
 		setErrorMessage(null);
@@ -774,6 +794,7 @@ public class CMainTab extends CLaunchConfigurationTab {
 	 * 
 	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getImage()
 	 */
+	@Override
 	public Image getImage() {
 		return LaunchImages.get(LaunchImages.IMG_VIEW_MAIN_TAB);
 	}
@@ -783,6 +804,7 @@ public class CMainTab extends CLaunchConfigurationTab {
 	 * 
 	 * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#updateLaunchConfigurationDialog()
 	 */
+	@Override
 	protected void updateLaunchConfigurationDialog() {
 		super.updateLaunchConfigurationDialog();
 	}