RESOLVED - bug 273636: changes to enable MBS on EFS projects

https://bugs.eclipse.org/bugs/show_bug.cgi?id=273636

4 files changed, 18 insertions, 1 deletions

diff --git a/build/org.eclipse.cdt.managedbuilder.ui/.project b/build/org.eclipse.cdt.managedbuilder.ui/.project
index 08a4cc93e2d..0efa7a6ca87 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/.project
+++ b/build/org.eclipse.cdt.managedbuilder.ui/.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/build/org.eclipse.cdt.managedbuilder.ui/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.managedbuilder.ui/META-INF/MANIFEST.MF
index 872462a02ef..5318a2f0481 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.managedbuilder.ui/META-INF/MANIFEST.MF
@@ -8,6 +8,7 @@ Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.cdt.managedbuilder.internal.ui.workingsets,
  org.eclipse.cdt.managedbuilder.ui.actions,
+ org.eclipse.cdt.managedbuilder.ui.preferences,
  org.eclipse.cdt.managedbuilder.ui.properties,
  org.eclipse.cdt.managedbuilder.ui.wizards
 Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
@@ -15,7 +16,7 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.ui;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.managedbuilder.core;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.cdt.managedbuilder.core;bundle-version="[5.1.0,6.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)",
  org.eclipse.ui.navigator;bundle-version="[3.2.0,4.0.0)";resolution:=optional,
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/AbstractToolSettingUI.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/AbstractToolSettingUI.java
index fd7ffaab44f..9837c516927 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/AbstractToolSettingUI.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/AbstractToolSettingUI.java
@@ -30,6 +30,9 @@ public abstract class AbstractToolSettingUI extends FieldEditorPreferencePage {
 		this(info, GRID);
 	}
 	
+	/**
+	 * @since 5.0
+	 */
 	protected AbstractToolSettingUI(IResourceInfo info, int style) {
  		super(style);
  		noDefaultAndApplyButton();
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSettingsTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSettingsTab.java
index 6e9a719f236..55e9b136980 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSettingsTab.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSettingsTab.java
@@ -449,10 +449,16 @@ public class ToolSettingsTab extends AbstractCBuildPropertyTab implements IPrefe
 			}
 		}
 		
+		/**
+		 * @since 5.0
+		 */
 		protected void addFilter(ViewerFilter filter) {
 			optionList.addFilter(filter);
 		}
 		
+		/**
+		 * @since 5.0
+		 */
 		@SuppressWarnings("unchecked")
 		protected void setOption(IOption op1, IOption op2, IHoldsOptions dst, IResourceInfo res){
 			try {
@@ -601,6 +607,7 @@ public class ToolSettingsTab extends AbstractCBuildPropertyTab implements IPrefe
 		 * Unlike the default provider, that provider also contains
 		 * the user-modified macros that are not applied yet
 		 * If the "Build Macros" tab is not available, returns the default BuildMacroProvider
+		 * @noreference This method is not intended to be referenced by clients.
 		 */
 		public BuildMacroProvider obtainMacroProvider(){
 			return (BuildMacroProvider)ManagedBuildManager.getBuildMacroProvider();