From c8e51d5da3bb8ca238b41e0b1226320a9ee06164 Mon Sep 17 00:00:00 2001 From: Chris Recoskie Date: Wed, 24 May 2006 13:12:24 +0000 Subject: [PATCH] fix for 139663 --- .../ui/actions/BuildFilesAction.java | 13 +++++++++++++ .../ui/actions/CleanFilesAction.java | 14 ++++++++++++++ 2 files changed, 27 insertions(+) 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 537e445ea96..16f4cdaeb31 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 @@ -31,6 +31,7 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Preferences; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.viewers.IStructuredSelection; @@ -259,6 +260,18 @@ public class BuildFilesAction extends ActionDelegate implements } private boolean shouldBeEnabled() { + + // fix for Bugzilla 139663 + // if build automatically is turned on, then this menu should be turned off as + // it will trigger the auto build + Preferences preferences = ResourcesPlugin.getPlugin().getPluginPreferences(); + + if(preferences.getBoolean(ResourcesPlugin.PREF_AUTO_BUILDING)) + { + // auto building is on... do not enable the menu + return false; + } + ISelectionService selectionService = workbenchWindow .getSelectionService(); ISelection selection = selectionService.getSelection(); 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 31b781e2d6e..1204c068657 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 @@ -28,6 +28,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.Preferences; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.action.IAction; @@ -264,6 +265,19 @@ public class CleanFilesAction extends ActionDelegate implements } private boolean shouldBeEnabled() { + + + // fix for Bugzilla 139663 + // if build automatically is turned on, then this menu should be turned off as + // it will trigger the auto build + Preferences preferences = ResourcesPlugin.getPlugin().getPluginPreferences(); + + if(preferences.getBoolean(ResourcesPlugin.PREF_AUTO_BUILDING)) + { + // auto building is on... do not enable the menu + return false; + } + ISelectionService selectionService = workbenchWindow .getSelectionService(); ISelection selection = selectionService.getSelection();