From d9b8eb3fd0061cb8ee70ee458f2ad00a953452ef Mon Sep 17 00:00:00 2001
From: Doug Schaefer <dschaefer@blackberry.com>
Date: Wed, 22 Nov 2017 16:40:14 -0500
Subject: [PATCH] Hook up the old Include Paths and Symbols page to Makefile
 projs.

Makefile projects depend on build output parsing to pick up
compiler options to use while indexing. Sometimes, that just
doesn't work. As a back up we've always allowed users to manually
add them to the project. Long ago when we had pure make projects
we had UI for this. This change hooks that old UI up. It was a
time before build configs so they get applied to them all but it
serves it's role as a backup when users run into problems.

Unmarked everything I use here from deprecated until we decide
how to replace these with Core build config aware settings.

Change-Id: I6fc4d48e5315df3c60c7591b026ae0a53a1f505e
---
 .../templates/simple/Makefile                 |  4 +
 build/org.eclipse.cdt.make.ui/plugin.xml      |  4 +-
 .../cdt/core/build/CBuildConfiguration.java   | 83 ++++++++++++++++++-
 .../cdt/core/build/ScannerInfoCache.java      | 32 +++++++
 .../cpaths/AbstractPathOptionBlock.java       |  4 -
 .../internal/ui/dialogs/cpaths/CPElement.java |  5 --
 .../ui/dialogs/cpaths/CPElementAttribute.java |  5 --
 .../ui/dialogs/cpaths/CPElementFilter.java    |  7 +-
 .../ui/dialogs/cpaths/CPElementGroup.java     |  5 --
 .../cpaths/CPElementLabelProvider.java        |  5 --
 .../dialogs/cpaths/CPListImageDescriptor.java | 18 ++--
 .../ui/dialogs/cpaths/CPathBasePage.java      |  4 -
 .../cpaths/CPathContainerDefaultPage.java     | 31 ++++---
 .../cpaths/CPathContainerDescriptor.java      |  5 --
 .../cpaths/CPathContainerSelectionPage.java   |  5 --
 .../dialogs/cpaths/CPathContainerWizard.java  |  5 --
 .../ui/dialogs/cpaths/CPathFilterPage.java    | 25 +++---
 .../CPathIncludeSymbolEntryBasePage.java      |  4 -
 .../cpaths/CPathIncludeSymbolEntryPage.java   |  4 -
 .../CPathIncludeSymbolEntryPerFilePage.java   |  4 -
 .../cpaths/ExclusionPatternDialog.java        |  6 --
 .../cpaths/ExclusionPatternEntryDialog.java   |  5 --
 .../dialogs/cpaths/IContainerDescriptor.java  |  6 --
 .../cpaths/IncludesSymbolsPropertyPage.java   |  2 -
 .../cpaths/NewIncludesSymbolsTabBlock.java    |  3 -
 .../cpaths/ProjectContainerDescriptor.java    | 12 +--
 .../dialogs/cpaths/ProjectContainerPage.java  |  5 --
 .../cdt/ui/dialogs/TabFolderOptionBlock.java  | 13 ++-
 .../ui/wizards/IPathEntryContainerPage.java   |  6 --
 29 files changed, 160 insertions(+), 157 deletions(-)

diff --git a/build/org.eclipse.cdt.make.core/templates/simple/Makefile b/build/org.eclipse.cdt.make.core/templates/simple/Makefile
index 8214dabe9d1..bcf0bb59a77 100644
--- a/build/org.eclipse.cdt.make.core/templates/simple/Makefile
+++ b/build/org.eclipse.cdt.make.core/templates/simple/Makefile
@@ -4,6 +4,10 @@ OBJS = ${projectName}.o
 
 ifeq ($(BUILD_MODE),debug)
 	CFLAGS += -g
+else ifeq ($(BUILD_MODE),run)
+	CFLAGS += -O2
+else
+	$(error Build mode $(BUILD_MODE) not supported by this Makefile)
 endif
 
 all:	${projectName}
diff --git a/build/org.eclipse.cdt.make.ui/plugin.xml b/build/org.eclipse.cdt.make.ui/plugin.xml
index e4c1f7bbd09..6f3fb11cb0d 100644
--- a/build/org.eclipse.cdt.make.ui/plugin.xml
+++ b/build/org.eclipse.cdt.make.ui/plugin.xml
@@ -197,7 +197,7 @@
    </extension>
    <extension
          point="org.eclipse.ui.propertyPages">
-      <page
+      <!--page
             objectClass="org.eclipse.core.resources.IProject"
             adaptable="true"
             name="%PropertyMakeProject.name"
@@ -220,7 +220,7 @@
                value="org.eclipse.cdt.make.core.makeNature">
          </filter>
       </page> 
-      <!--page
+      <page
             objectClass="org.eclipse.cdt.core.model.ICContainer"
             name="%IncludeSymbolProperties.name"
             class="org.eclipse.cdt.internal.ui.dialogs.cpaths.IncludesSymbolsPropertyPage"
diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java
index c79947593a2..1d0e524cf46 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java
@@ -37,11 +37,18 @@ import org.eclipse.cdt.core.IMarkerGenerator;
 import org.eclipse.cdt.core.ProblemMarkerInfo;
 import org.eclipse.cdt.core.envvar.IEnvironmentVariable;
 import org.eclipse.cdt.core.model.CoreModel;
+import org.eclipse.cdt.core.model.ElementChangedEvent;
 import org.eclipse.cdt.core.model.IBinary;
 import org.eclipse.cdt.core.model.IBinaryContainer;
 import org.eclipse.cdt.core.model.ICElement;
+import org.eclipse.cdt.core.model.ICElementDelta;
 import org.eclipse.cdt.core.model.ICModelMarker;
 import org.eclipse.cdt.core.model.ICProject;
+import org.eclipse.cdt.core.model.IElementChangedListener;
+import org.eclipse.cdt.core.model.IIncludeEntry;
+import org.eclipse.cdt.core.model.IIncludeFileEntry;
+import org.eclipse.cdt.core.model.IMacroEntry;
+import org.eclipse.cdt.core.model.IMacroFileEntry;
 import org.eclipse.cdt.core.model.ITranslationUnit;
 import org.eclipse.cdt.core.parser.ExtendedScannerInfo;
 import org.eclipse.cdt.core.parser.IExtendedScannerInfo;
@@ -92,7 +99,7 @@ import com.google.gson.JsonParseException;
  * @since 6.0
  */
 public abstract class CBuildConfiguration extends PlatformObject
-		implements ICBuildConfiguration, IMarkerGenerator, IConsoleParser {
+		implements ICBuildConfiguration, IMarkerGenerator, IConsoleParser, IElementChangedListener {
 
 	private static final String LAUNCH_MODE = "cdt.launchMode"; //$NON-NLS-1$
 
@@ -129,6 +136,8 @@ public abstract class CBuildConfiguration extends PlatformObject
 		this.toolChain = tc;
 
 		this.launchMode = settings.get(LAUNCH_MODE, "run"); //$NON-NLS-1$
+
+		CoreModel.getDefault().addElementChangedListener(this);
 	}
 
 	protected CBuildConfiguration(IBuildConfiguration config, String name, IToolChain toolChain) {
@@ -156,6 +165,8 @@ public abstract class CBuildConfiguration extends PlatformObject
 		} catch (BackingStoreException e) {
 			CCorePlugin.log(e);
 		}
+
+		CoreModel.getDefault().addElementChangedListener(this);
 	}
 
 	protected CBuildConfiguration(IBuildConfiguration config, IToolChain toolChain) {
@@ -651,6 +662,34 @@ public abstract class CBuildConfiguration extends PlatformObject
 		return scannerInfoCache;
 	}
 
+	private IExtendedScannerInfo getBaseScannerInfo(IResource resource) throws CoreException {
+		IPath resPath = resource.getFullPath();
+		IIncludeEntry[] includeEntries = CoreModel.getIncludeEntries(resPath);
+		String[] includes = new String[includeEntries.length];
+		for (int i = 0; i < includeEntries.length; ++i) {
+			includes[i] = includeEntries[i].getFullIncludePath().toOSString();
+		}
+
+		IIncludeFileEntry[] includeFileEntries = CoreModel.getIncludeFileEntries(resPath);
+		String[] includeFiles = new String[includeFileEntries.length];
+		for (int i = 0; i < includeFiles.length; ++i) {
+			includeFiles[i] = includeFileEntries[i].getFullIncludeFilePath().toOSString();
+		}
+
+		IMacroEntry[] macros = CoreModel.getMacroEntries(resPath);
+		Map<String, String> symbolMap = new HashMap<String, String>();
+		for (int i = 0; i < macros.length; ++i) {
+			symbolMap.put(macros[i].getMacroName(), macros[i].getMacroValue());
+		}
+
+		IMacroFileEntry[] macroFileEntries = CoreModel.getMacroFileEntries(resPath);
+		String[] macroFiles = new String[macroFileEntries.length];
+		for (int i = 0; i < macroFiles.length; ++i) {
+			macroFiles[i] = macroFileEntries[i].getFullMacroFilePath().toOSString();
+		}
+		return new ExtendedScannerInfo(symbolMap, includes, includeFiles, macroFiles);
+	}
+
 	@Override
 	public IScannerInfo getScannerInformation(IResource resource) {
 		loadScannerInfoCache();
@@ -658,10 +697,10 @@ public abstract class CBuildConfiguration extends PlatformObject
 		if (info == null) {
 			ICElement celement = CCorePlugin.getDefault().getCoreModel().create(resource);
 			if (celement instanceof ITranslationUnit) {
-				ITranslationUnit tu = (ITranslationUnit) celement;
 				try {
-					info = getToolChain().getDefaultScannerInfo(getBuildConfiguration(), null,
-							tu.getLanguage(), getBuildDirectoryURI());
+					ITranslationUnit tu = (ITranslationUnit) celement;
+					info = getToolChain().getDefaultScannerInfo(getBuildConfiguration(),
+							getBaseScannerInfo(resource), tu.getLanguage(), getBuildDirectoryURI());
 					scannerInfoCache.addScannerInfo(DEFAULT_COMMAND, info, resource);
 					saveScannerInfoCache();
 				} catch (CoreException e) {
@@ -672,6 +711,42 @@ public abstract class CBuildConfiguration extends PlatformObject
 		return info;
 	}
 
+	@Override
+	public void elementChanged(ElementChangedEvent event) {
+		// check if the path entries changed in the project and clear the cache if so
+		processElementDelta(event.getDelta());
+	}
+
+	private void processElementDelta(ICElementDelta delta) {
+		if (delta == null) {
+			return;
+		}
+
+		int flags = delta.getFlags();
+		int kind = delta.getKind();
+		if (kind == ICElementDelta.CHANGED) {
+			if ((flags & (ICElementDelta.F_CHANGED_PATHENTRY_INCLUDE
+					| ICElementDelta.F_CHANGED_PATHENTRY_MACRO)) != 0) {
+				IResource resource = delta.getElement().getResource();
+				if (resource.getProject().equals(getProject())) {
+					loadScannerInfoCache();
+					if (scannerInfoCache.hasResource(DEFAULT_COMMAND, resource)) {
+						scannerInfoCache.removeResource(resource);
+					} else {
+						// Clear the whole command and exit the delta
+						scannerInfoCache.removeCommand(DEFAULT_COMMAND);
+						return;
+					}
+				}
+			}
+		}
+
+		ICElementDelta[] affectedChildren = delta.getAffectedChildren();
+		for (int i = 0; i < affectedChildren.length; i++) {
+			processElementDelta(affectedChildren[i]);
+		}
+	}
+
 	private boolean infoChanged = false;
 
 	@Override
diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/ScannerInfoCache.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/ScannerInfoCache.java
index d055ce85f8b..884e9c1dee3 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/ScannerInfoCache.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/ScannerInfoCache.java
@@ -134,4 +134,36 @@ public class ScannerInfoCache {
 		resourceMap.put(resourcePath, command);
 	}
 
+	/**
+	 * @since 6.4
+	 */
+	public void removeResource(IResource resource) {
+		String resourcePath = resource.getLocation().toOSString();
+		Command command = resourceMap.get(resourcePath);
+		if (command != null) {
+			command.resourcePaths.remove(resourcePath);
+			if (command.resourcePaths.isEmpty()) {
+				commands.remove(command);
+				commandMap.remove(command.command);
+			}
+			resourceMap.remove(resourcePath);
+		}
+	}
+
+	/**
+	 * @since 6.4
+	 */
+	public void removeCommand(List<String> commandStrings) {
+		Command command = commandMap.remove(commandStrings);
+		if (command != null) {
+			commands.remove(command);
+			for (String resourcePath : command.resourcePaths) {
+				Command current = resourceMap.get(resourcePath);
+				if (current.equals(command)) {
+					resourceMap.remove(resourcePath);
+				}
+			}
+		}
+	}
+
 }
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/AbstractPathOptionBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/AbstractPathOptionBlock.java
index 7d5e6fac4f4..dbfee3b6874 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/AbstractPathOptionBlock.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/AbstractPathOptionBlock.java
@@ -41,11 +41,7 @@ import org.eclipse.cdt.internal.ui.util.CoreUtility;
 
 /**
  * Abstract block for C/C++ Project Paths page for 3.X projects.
- * 
- * @deprecated as of CDT 4.0. This option block was used to set preferences/properties
- * for 3.X style projects.
  */
-@Deprecated
 abstract public class AbstractPathOptionBlock extends TabFolderOptionBlock implements ICOptionContainer {
 
 	private StatusInfo fCPathStatus;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElement.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElement.java
index 12baa493fad..c5e71a005e7 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElement.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElement.java
@@ -37,11 +37,6 @@ import org.eclipse.cdt.core.model.IPathEntryContainerExtension;
 import org.eclipse.cdt.core.model.ISourceEntry;
 import org.eclipse.cdt.ui.CUIPlugin;
 
-/**
- * @deprecated as of CDT 4.0. This class was used for property pages
- * for 3.X style projects.
- */
-@Deprecated
 public class CPElement {
 	public static final String SOURCEATTACHMENT = "sourcepath"; //$NON-NLS-1$
 	public static final String SOURCEATTACHMENTROOT = "rootpath"; //$NON-NLS-1$
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementAttribute.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementAttribute.java
index 6236ff56f8b..43080927630 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementAttribute.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementAttribute.java
@@ -10,11 +10,6 @@
  *******************************************************************************/
 package org.eclipse.cdt.internal.ui.dialogs.cpaths;
 
-/**
- * @deprecated as of CDT 4.0. This class was used for property pages
- * for 3.X style projects.
- */
-@Deprecated
 public class CPElementAttribute {
 
 	private CPElement fParent;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementFilter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementFilter.java
index ff680a87ee0..79b60448319 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementFilter.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementFilter.java
@@ -13,18 +13,15 @@ package org.eclipse.cdt.internal.ui.dialogs.cpaths;
 import java.util.Arrays;
 import java.util.List;
 
-import org.eclipse.cdt.core.model.IPathEntry;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerFilter;
 
+import org.eclipse.cdt.core.model.IPathEntry;
+
 /**
  * Viewer filter for archive selection dialogs. Archives are files with file extension '.so', '.dll' and '.a'. The filter is not
  * case sensitive.
- * 
- * @deprecated as of CDT 4.0. This class was used for property pages
- * for 3.X style projects.
  */
-@Deprecated
 public class CPElementFilter extends ViewerFilter {
 
 	protected List<Object> fExcludes;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementGroup.java
index 292d33a2bb9..6cd00bd8de1 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementGroup.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementGroup.java
@@ -21,11 +21,6 @@ import java.util.Map;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.IPath;
 
-/**
- * @deprecated as of CDT 4.0. This class was used for property pages
- * for 3.X style projects.
- */
-@Deprecated
 public class CPElementGroup {
 
 	private CPElement parent;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementLabelProvider.java
index 900459958d7..e7b4fe63c7f 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementLabelProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementLabelProvider.java
@@ -35,11 +35,6 @@ import org.eclipse.cdt.ui.CUIPlugin;
 
 import org.eclipse.cdt.internal.ui.util.ImageDescriptorRegistry;
 
-/**
- * @deprecated as of CDT 4.0. This class was used for property pages
- * for 3.X style projects.
- */
-@Deprecated
 class CPElementLabelProvider extends LabelProvider implements IColorProvider {
 
 	private Color inDirect = new Color(Display.getDefault(), new RGB(170, 170, 170));
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPListImageDescriptor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPListImageDescriptor.java
index 8f20e101938..4fcb2398012 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPListImageDescriptor.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPListImageDescriptor.java
@@ -10,17 +10,13 @@
  *******************************************************************************/
 package org.eclipse.cdt.internal.ui.dialogs.cpaths;
 
-import org.eclipse.cdt.internal.ui.CPluginImages;
 import org.eclipse.jface.resource.CompositeImageDescriptor;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.graphics.ImageData;
 import org.eclipse.swt.graphics.Point;
 
-/**
- * @deprecated as of CDT 4.0. This class was used for property pages
- * for 3.X style projects.
- */
-@Deprecated
+import org.eclipse.cdt.internal.ui.CPluginImages;
+
 public class CPListImageDescriptor extends CompositeImageDescriptor {
 
 	/** Flag to render the waring adornment */
@@ -48,7 +44,7 @@ public class CPListImageDescriptor extends CompositeImageDescriptor {
 	@Override
 	protected Point getSize() {
 		if (fSize == null) {
-			ImageData data = fBaseImage.getImageData();
+			ImageData data = fBaseImage.getImageData(100);
 			setSize(new Point(data.width, data.height));
 		}
 		return fSize;
@@ -80,7 +76,7 @@ public class CPListImageDescriptor extends CompositeImageDescriptor {
 	 */
 	@Override
 	protected void drawCompositeImage(int width, int height) {
-		ImageData bg = fBaseImage.getImageData();
+		ImageData bg = fBaseImage.getImageData(100);
 		if (bg == null) {
 			bg = DEFAULT_IMAGE_DATA;
 		}
@@ -96,17 +92,17 @@ public class CPListImageDescriptor extends CompositeImageDescriptor {
 		ImageData data = null;
 		int x= getSize().x;
 		if ((flags & PATH_INHERIT) == PATH_INHERIT) {
-			data = CPluginImages.DESC_OVR_PATH_INHERIT.getImageData();
+			data = CPluginImages.DESC_OVR_PATH_INHERIT.getImageData(100);
 			drawImage(data, x, 0);
 		}
 		x= 0;
 		if ((flags & ERROR) != 0) {
-			data= CPluginImages.DESC_OVR_ERROR.getImageData();
+			data = CPluginImages.DESC_OVR_ERROR.getImageData(100);
 			drawImage(data, x, size.y - data.height);
 			x+= data.width;
 		}
 		if ((flags & WARNING) != 0) {
-			data= CPluginImages.DESC_OVR_WARNING.getImageData();
+			data = CPluginImages.DESC_OVR_WARNING.getImageData(100);
 			drawImage(data, x, size.y - data.height);
 			x+= data.width;
 		}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathBasePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathBasePage.java
index 66396b63ed8..ff9daa589c2 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathBasePage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathBasePage.java
@@ -23,11 +23,7 @@ import org.eclipse.cdt.ui.dialogs.AbstractCOptionPage;
 
 /**
  * Abstract Option Page for C/C++ Project Paths page for 3.X projects.
- * 
- * @deprecated as of CDT 4.0. This page was used to set preferences/properties
- * for 3.X style projects.
  */
-@Deprecated
 public abstract class CPathBasePage extends AbstractCOptionPage {
 
 	public CPathBasePage(String title) {
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerDefaultPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerDefaultPage.java
index 4c30db619ff..9a8733d6aa5 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerDefaultPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerDefaultPage.java
@@ -12,18 +12,6 @@ package org.eclipse.cdt.internal.ui.dialogs.cpaths;
 
 import java.util.ArrayList;
 
-import org.eclipse.cdt.core.model.CoreModel;
-import org.eclipse.cdt.core.model.ICProject;
-import org.eclipse.cdt.core.model.IContainerEntry;
-import org.eclipse.cdt.core.model.IPathEntry;
-import org.eclipse.cdt.internal.ui.CPluginImages;
-import org.eclipse.cdt.internal.ui.dialogs.StatusInfo;
-import org.eclipse.cdt.internal.ui.wizards.NewElementWizardPage;
-import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField;
-import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener;
-import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil;
-import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringDialogField;
-import org.eclipse.cdt.ui.wizards.IPathEntryContainerPage;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.jface.dialogs.Dialog;
@@ -31,11 +19,20 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 
-/**
- * @deprecated as of CDT 4.0. This class was used for property pages/wizards
- * for 3.X style projects.
- */
-@Deprecated
+import org.eclipse.cdt.core.model.CoreModel;
+import org.eclipse.cdt.core.model.ICProject;
+import org.eclipse.cdt.core.model.IContainerEntry;
+import org.eclipse.cdt.core.model.IPathEntry;
+import org.eclipse.cdt.ui.wizards.IPathEntryContainerPage;
+
+import org.eclipse.cdt.internal.ui.CPluginImages;
+import org.eclipse.cdt.internal.ui.dialogs.StatusInfo;
+import org.eclipse.cdt.internal.ui.wizards.NewElementWizardPage;
+import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField;
+import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener;
+import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil;
+import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringDialogField;
+
 public class CPathContainerDefaultPage extends NewElementWizardPage implements IPathEntryContainerPage {
 	private StringDialogField fEntryField;
 	private ArrayList<IPath> fUsedPaths;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerDescriptor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerDescriptor.java
index 623afec6639..3356eb2f518 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerDescriptor.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerDescriptor.java
@@ -38,11 +38,6 @@ import org.eclipse.cdt.ui.wizards.IPathEntryContainerPage;
 
 import org.eclipse.cdt.internal.ui.util.CoreUtility;
 
-/**
- * @deprecated as of CDT 4.0. This wizard was used in property pages/wizards
- * for 3.X style projects.
- */
-@Deprecated
 public class CPathContainerDescriptor implements IContainerDescriptor {
 
 
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerSelectionPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerSelectionPage.java
index 51e18144919..003442e49b0 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerSelectionPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerSelectionPage.java
@@ -33,11 +33,6 @@ import org.eclipse.cdt.ui.CUIPlugin;
 import org.eclipse.cdt.internal.ui.CPluginImages;
 import org.eclipse.cdt.internal.ui.viewsupport.ListContentProvider;
 
-/**
- * @deprecated as of CDT 4.0. This page was used for CPathContainerWizard
- * for 3.X style projects.
-  */
-@Deprecated
 public class CPathContainerSelectionPage extends WizardPage {
 
 	private static final String DIALOGSTORE_SECTION= "CPathContainerSelectionPage"; //$NON-NLS-1$
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerWizard.java
index 3282c7dcf51..75243a15d30 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerWizard.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerWizard.java
@@ -29,11 +29,6 @@ import org.eclipse.cdt.ui.wizards.IPathEntryContainerPage;
 
 import org.eclipse.cdt.internal.ui.util.ExceptionHandler;
 
-/**
- * @deprecated as of CDT 4.0. This wizard was used in property pages
- * for 3.X style projects.
- */
-@Deprecated
 public class CPathContainerWizard extends Wizard {
 
 	private IContainerDescriptor fPageDesc;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathFilterPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathFilterPage.java
index 87de65daa96..caa7e15a93c 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathFilterPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathFilterPage.java
@@ -14,15 +14,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.eclipse.cdt.core.model.CModelException;
-import org.eclipse.cdt.core.model.CoreModel;
-import org.eclipse.cdt.core.model.ICElement;
-import org.eclipse.cdt.core.model.ICProject;
-import org.eclipse.cdt.core.model.IPathEntry;
-import org.eclipse.cdt.core.model.IPathEntryContainer;
-import org.eclipse.cdt.internal.ui.CPluginImages;
-import org.eclipse.cdt.internal.ui.viewsupport.ListContentProvider;
-import org.eclipse.cdt.ui.CUIPlugin;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.viewers.CheckStateChangedEvent;
@@ -36,11 +27,17 @@ import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 
-/**
- * @deprecated as of CDT 4.0. This page was used in Path Container Wizard
- * for 3.X style projects.
- */
-@Deprecated
+import org.eclipse.cdt.core.model.CModelException;
+import org.eclipse.cdt.core.model.CoreModel;
+import org.eclipse.cdt.core.model.ICElement;
+import org.eclipse.cdt.core.model.ICProject;
+import org.eclipse.cdt.core.model.IPathEntry;
+import org.eclipse.cdt.core.model.IPathEntryContainer;
+import org.eclipse.cdt.ui.CUIPlugin;
+
+import org.eclipse.cdt.internal.ui.CPluginImages;
+import org.eclipse.cdt.internal.ui.viewsupport.ListContentProvider;
+
 public class CPathFilterPage extends WizardPage {
 
 	private final int[] fFilterType;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryBasePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryBasePage.java
index add6956ba60..5d0a4f4bd27 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryBasePage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryBasePage.java
@@ -18,11 +18,7 @@ import org.eclipse.cdt.core.model.ICElement;
 
 /**
  * Abstract DialogPage for C/C++ Project Paths page for 3.X projects.
- * 
- * @deprecated as of CDT 4.0. This page was used to set preferences/properties
- * for 3.X style projects.
  */
-@Deprecated
 public abstract class CPathIncludeSymbolEntryBasePage extends CPathBasePage {
 
     public CPathIncludeSymbolEntryBasePage(String title) {
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPage.java
index c2cbf205d59..8cc53b7c23a 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPage.java
@@ -70,11 +70,7 @@ import org.eclipse.cdt.internal.ui.wizards.dialogfields.TreeListDialogField;
 
 /**
  * DialogPage for C/C++ Project Paths page for 3.X projects.
- * 
- * @deprecated as of CDT 4.0. This page was used for property pages
- * for 3.X style projects.
  */
-@Deprecated
 public class CPathIncludeSymbolEntryPage extends CPathIncludeSymbolEntryBasePage {
 	private TreeListDialogField<CPElementGroup> fIncludeSymPathsList;
 	private SelectionButtonDialogField fShowInheritedPaths;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPerFilePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPerFilePage.java
index 28bdec93562..39d6999fdef 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPerFilePage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPerFilePage.java
@@ -71,11 +71,7 @@ import org.eclipse.cdt.internal.ui.wizards.dialogfields.TreeListDialogField;
 
 /**
  * DialogPage for C/C++ Project Paths page for 3.X projects.
- * 
- * @deprecated as of CDT 4.0. This page was used for property pages
- * for 3.X style projects.
  */
-@Deprecated
 public class CPathIncludeSymbolEntryPerFilePage extends CPathIncludeSymbolEntryBasePage {
 
     private TreeListDialogField<CPElementGroup> fIncludeSymPathsList;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ExclusionPatternDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ExclusionPatternDialog.java
index 670ffb9041d..b43edfd3f25 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ExclusionPatternDialog.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ExclusionPatternDialog.java
@@ -52,12 +52,6 @@ import org.eclipse.cdt.internal.ui.wizards.dialogfields.IListAdapter;
 import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil;
 import org.eclipse.cdt.internal.ui.wizards.dialogfields.ListDialogField;
 
-/**
- * @deprecated as of CDT 4.0. This dialog was used for property pages
- * for 3.X style projects.
- *
- */
-@Deprecated
 public class ExclusionPatternDialog extends StatusDialog {
 	
 	private static class ExclusionPatternLabelProvider extends LabelProvider {
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ExclusionPatternEntryDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ExclusionPatternEntryDialog.java
index 09e65869eed..da161a5548b 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ExclusionPatternEntryDialog.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ExclusionPatternEntryDialog.java
@@ -47,11 +47,6 @@ import org.eclipse.cdt.internal.ui.wizards.dialogfields.IStringButtonAdapter;
 import org.eclipse.cdt.internal.ui.wizards.dialogfields.LayoutUtil;
 import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringButtonDialogField;
 
-/**
- * @deprecated as of CDT 4.0. This class was used for property pages
- * for 3.X style projects.
- */
-@Deprecated
 public class ExclusionPatternEntryDialog extends StatusDialog {
 
 	private StringButtonDialogField fExclusionPatternDialog;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/IContainerDescriptor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/IContainerDescriptor.java
index 01375d8fba5..0766122be85 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/IContainerDescriptor.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/IContainerDescriptor.java
@@ -16,12 +16,6 @@ import org.eclipse.swt.graphics.Image;
 import org.eclipse.cdt.core.model.IPathEntry;
 import org.eclipse.cdt.ui.wizards.IPathEntryContainerPage;
 
-/**
- * @deprecated as of CDT 4.0. This class was used for property pages
- * for 3.X style projects.
- * @noreference This interface is not intended to be referenced by clients.
- */
-@Deprecated
 public interface IContainerDescriptor {
 	public IPathEntryContainerPage createPage() throws CoreException;
 	public String getName();
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/IncludesSymbolsPropertyPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/IncludesSymbolsPropertyPage.java
index 66195c72327..51178f64fd5 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/IncludesSymbolsPropertyPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/IncludesSymbolsPropertyPage.java
@@ -45,10 +45,8 @@ import org.eclipse.cdt.internal.ui.dialogs.StatusUtil;
 import org.eclipse.cdt.internal.ui.util.ExceptionHandler;
 
 /**
- * @deprecated as of CDT 4.0.
  * @noreference This class is not intended to be referenced by clients.
  */
-@Deprecated
 public class IncludesSymbolsPropertyPage extends PropertyPage implements IStatusChangeListener, IPathEntryStoreListener {
 	private static final String PAGE_SETTINGS = "IncludeSysmbolsPropertyPage"; //$NON-NLS-1$
 	private static final String INDEX = "pageIndex"; //$NON-NLS-1$
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/NewIncludesSymbolsTabBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/NewIncludesSymbolsTabBlock.java
index 5321218f631..e2d1137bee3 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/NewIncludesSymbolsTabBlock.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/NewIncludesSymbolsTabBlock.java
@@ -28,10 +28,7 @@ import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener;
 
 /**
  * Block for C/C++ Include Paths and Symbols page for 3.X projects.
- * 
- * @deprecated as of CDT 4.0.
  */
-@Deprecated
 public class NewIncludesSymbolsTabBlock extends AbstractPathOptionBlock implements IStatusChangeListener {
 
 	private CPathIncludeSymbolEntryBasePage fIncludeSymbols;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ProjectContainerDescriptor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ProjectContainerDescriptor.java
index de6a65a8485..1df05f5af0c 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ProjectContainerDescriptor.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ProjectContainerDescriptor.java
@@ -10,18 +10,14 @@
  *******************************************************************************/
 package org.eclipse.cdt.internal.ui.dialogs.cpaths;
 
-import org.eclipse.cdt.core.model.IPathEntry;
-import org.eclipse.cdt.ui.CUIPlugin;
-import org.eclipse.cdt.ui.wizards.IPathEntryContainerPage;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.ide.IDE;
 
-/**
- * @deprecated as of CDT 4.0. This class was used for Path Container Wizard
- * for 3.X style projects.
- */
-@Deprecated
+import org.eclipse.cdt.core.model.IPathEntry;
+import org.eclipse.cdt.ui.CUIPlugin;
+import org.eclipse.cdt.ui.wizards.IPathEntryContainerPage;
+
 public class ProjectContainerDescriptor implements IContainerDescriptor {
 	private int[] fFilterType;
 	
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ProjectContainerPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ProjectContainerPage.java
index 6c60deae7ac..b18dd12027d 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ProjectContainerPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ProjectContainerPage.java
@@ -41,11 +41,6 @@ import org.eclipse.cdt.ui.wizards.IPathEntryContainerPage;
 import org.eclipse.cdt.internal.ui.CPluginImages;
 import org.eclipse.cdt.internal.ui.viewsupport.ListContentProvider;
 
-/**
- * @deprecated as of CDT 4.0. This class was used for Path Container Wizard
- * for 3.X style projects.
- */
-@Deprecated
 public class ProjectContainerPage extends WizardPage implements IPathEntryContainerPage {
 
 	private int[] fFilterType;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/TabFolderOptionBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/TabFolderOptionBlock.java
index 05428c70c93..8ca0c80ed76 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/TabFolderOptionBlock.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/TabFolderOptionBlock.java
@@ -15,9 +15,6 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.eclipse.cdt.internal.ui.CUIMessages;
-import org.eclipse.cdt.ui.CUIPlugin;
-import org.eclipse.cdt.utils.ui.controls.TabFolderLayout;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
@@ -35,11 +32,11 @@ import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.TabFolder;
 import org.eclipse.swt.widgets.TabItem;
 
-/**
- * @deprecated as of CDT 4.0. This abstract block was used for New Project Wizards
- * and property pages for 3.X style projects.
- */
-@Deprecated
+import org.eclipse.cdt.ui.CUIPlugin;
+import org.eclipse.cdt.utils.ui.controls.TabFolderLayout;
+
+import org.eclipse.cdt.internal.ui.CUIMessages;
+
 public abstract class TabFolderOptionBlock {
 
 	protected boolean initializingTabs = true;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/IPathEntryContainerPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/IPathEntryContainerPage.java
index 9d6e1ac640e..e5a0afde7cb 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/IPathEntryContainerPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/IPathEntryContainerPage.java
@@ -16,12 +16,6 @@ import org.eclipse.cdt.core.model.ICProject;
 import org.eclipse.cdt.core.model.IContainerEntry;
 import org.eclipse.cdt.core.model.IPathEntry;
 
-/**
- * @deprecated as of CDT 4.0. This tab was used to set preferences/properties
- * for 3.X style projects.
- * @noreference This interface is not intended to be referenced by clients.
- */
-@Deprecated
 public interface IPathEntryContainerPage extends IWizardPage {
 	/**
 	 * Method <code>initialize()</code> is called before  <code>ICPathContainerPage.setSelection</code>