further fixes for 139797

3 files changed, 21 insertions, 5 deletions

diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
index 52393992fcd..c19233ad0fb 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
@@ -150,7 +150,7 @@
      <actionSet
            id="org.eclipse.cdt.managedbuilder.ui.buildSelectedFilesActionSet"
            label="%BuildSelectedFilesActionSet.label"
-           visible="true">
+           visible="false">
         <action
               class="org.eclipse.cdt.managedbuilder.ui.actions.BuildFilesAction"
               enablesFor="+"
@@ -191,7 +191,7 @@
      </objectContribution>
      <objectContribution
            adaptable="true"
-           id="org.eclipse.cdt.managedbuilder.ui.objectContribution1"
+           id="org.eclipse.cdt.managedbuilder.ui.BuildSelectedFilesContribution"
            objectClass="org.eclipse.core.resources.IResource">
         <action
               class="org.eclipse.cdt.managedbuilder.ui.actions.BuildFilesAction"
@@ -205,12 +205,16 @@
               id="org.eclipse.cdt.managedbuilder.ui.popups.cleanFilesAction"
               label="%CleanSelectedFiles.label"
               menubarPath="additions"/>
+        <filter
+              name="projectNature"
+              value="org.eclipse.cdt.managedbuilder.core.managedBuildNature"/>
      </objectContribution>
   </extension>
   <extension
         point="org.eclipse.ui.perspectiveExtensions">
      <perspectiveExtension targetID="org.eclipse.cdt.ui.CPerspective">
         <actionSet id="org.eclipse.cdt.managedbuilder.ui.buildConfigActionSet"/>
+        <actionSet id="org.eclipse.cdt.managedbuilder.ui.buildSelectedFilesActionSet"/>
      </perspectiveExtension>
   </extension>   
 </plugin>
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/actions/BuildFilesAction.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/actions/BuildFilesAction.java
index 2a3f078b90b..827f20d8b67 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/actions/BuildFilesAction.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/actions/BuildFilesAction.java
@@ -266,9 +266,13 @@ public class BuildFilesAction extends ActionDelegate implements IWorkbenchWindow
 		ISelectionService selectionService = workbenchWindow
 				.getSelectionService();
 		ISelection selection = selectionService.getSelection();
-
+		
 		if (selection instanceof IStructuredSelection) {
 			IStructuredSelection structuredSelection = (IStructuredSelection) selection;
+			
+			if(structuredSelection.size() <= 0)
+				return false;
+			
 			for (Iterator elements = structuredSelection.iterator(); elements
 					.hasNext();) {
 				IFile file = convertToIFile(elements.next());
@@ -310,9 +314,11 @@ public class BuildFilesAction extends ActionDelegate implements IWorkbenchWindow
 					return false;
 				}
 			}
+			return true;
 		}
+		
+		return false;
 
-		return true;
 	}
 	
 	/*
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/actions/CleanFilesAction.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/actions/CleanFilesAction.java
index 46d56367a57..5ae259d1c4f 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/actions/CleanFilesAction.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/actions/CleanFilesAction.java
@@ -278,6 +278,10 @@ public class CleanFilesAction extends ActionDelegate implements IWorkbenchWindow
 
 		if (selection instanceof IStructuredSelection) {
 			IStructuredSelection structuredSelection = (IStructuredSelection) selection;
+			
+			if(structuredSelection.size() <= 0)
+				return false;
+			
 			for (Iterator elements = structuredSelection.iterator(); elements
 					.hasNext();) {
 				IFile file = convertToIFile(elements.next());
@@ -305,9 +309,11 @@ public class CleanFilesAction extends ActionDelegate implements IWorkbenchWindow
 				}
 				
 			}
+			
+			return true;
 		}
 
-		return true;
+		return false;
 	}