diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeResources.properties b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeResources.properties index 0d37c9d9ee2..ab0eb58f122 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeResources.properties +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeResources.properties @@ -211,10 +211,11 @@ ManageScannerConfigDialogCommon.discoveredGroup.selected.label=Selected: ManageScannerConfigDialogCommon.discoveredGroup.removed.label=Removed: ManageScannerConfigDialogCommon.discoveredGroup.buttons.up.label=Up ManageScannerConfigDialogCommon.discoveredGroup.buttons.down.label=Down -ManageScannerConfigDialogCommon.discoveredGroup.buttons.remove.label=Remove -ManageScannerConfigDialogCommon.discoveredGroup.buttons.restore.label=Restore +ManageScannerConfigDialogCommon.discoveredGroup.buttons.disable.label=Disable +ManageScannerConfigDialogCommon.discoveredGroup.buttons.enable.label=Enable ManageScannerConfigDialogCommon.discoveredGroup.buttons.delete.label=Delete ManageScannerConfigDialogCommon.discoveredGroup.buttons.deleteAll.label=Delete all +ManageScannerConfigDialogCommon.discoveredGroup.annotation.disabled=disabled # --- ManageDefinedSymbolsDialog dialog --- ManageDefinedSymbolsDialog.title=Manage defined symbols diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/scannerconfig/DiscoveredElementLabelProvider.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/scannerconfig/DiscoveredElementLabelProvider.java index 5a81083ccd2..afb358cdd4a 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/scannerconfig/DiscoveredElementLabelProvider.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/scannerconfig/DiscoveredElementLabelProvider.java @@ -13,6 +13,7 @@ package org.eclipse.cdt.make.internal.ui.scannerconfig; import org.eclipse.cdt.internal.ui.CPluginImages; import org.eclipse.cdt.internal.ui.dialogs.cpaths.CPathEntryMessages; import org.eclipse.cdt.internal.ui.util.ImageDescriptorRegistry; +import org.eclipse.cdt.make.internal.ui.MakeUIPlugin; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.jface.resource.CompositeImageDescriptor; import org.eclipse.jface.resource.ImageDescriptor; @@ -37,6 +38,9 @@ public class DiscoveredElementLabelProvider extends LabelProvider implements ICo private ImageDescriptor fRemovedIncludeIcon, fRemovedMacroIcon; private ImageDescriptorRegistry fRegistry; + private final String DISABLED_LABEL = MakeUIPlugin. + getResourceString("ManageScannerConfigDialogCommon.discoveredGroup.annotation.disabled");//$NON-NLS-1$ + public DiscoveredElementLabelProvider() { fRegistry = CUIPlugin.getImageDescriptorRegistry(); fIncludeIcon = CPluginImages.DESC_OBJS_INCLUDES_FOLDER; @@ -98,12 +102,20 @@ public class DiscoveredElementLabelProvider extends LabelProvider implements ICo case DiscoveredElement.CONTAINER: case DiscoveredElement.INCLUDE_PATH: case DiscoveredElement.SYMBOL_DEFINITION: - return elem.getEntry() + (elem.isRemoved() ? " (removed)" : ""); + return elem.getEntry() + (elem.isRemoved() ? addAnnotation(DISABLED_LABEL) : ""); //$NON-NLS-1$ } } return super.getText(element); } + /** + * @param annotation + * @return + */ + private String addAnnotation(String annotation) { + return " (" + annotation + ")"; //$NON-NLS-1$ //$NON-NLS-2$ + } + /* (non-Javadoc) * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object) */ diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/DiscoveredPathContainerPage.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/DiscoveredPathContainerPage.java index e9c4a212726..83f35a74a65 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/DiscoveredPathContainerPage.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/DiscoveredPathContainerPage.java @@ -60,8 +60,8 @@ public class DiscoveredPathContainerPage extends WizardPage implements ICPathCon private static final String DISC_COMMON_PREFIX = "ManageScannerConfigDialogCommon"; //$NON-NLS-1$ private static final String UP = DISC_COMMON_PREFIX + ".discoveredGroup.buttons.up.label"; //$NON-NLS-1$ private static final String DOWN = DISC_COMMON_PREFIX + ".discoveredGroup.buttons.down.label"; //$NON-NLS-1$ - private static final String REMOVE = DISC_COMMON_PREFIX + ".discoveredGroup.buttons.remove.label"; //$NON-NLS-1$ - private static final String RESTORE = DISC_COMMON_PREFIX + ".discoveredGroup.buttons.restore.label"; //$NON-NLS-1$ + private static final String DISABLE = DISC_COMMON_PREFIX + ".discoveredGroup.buttons.disable.label"; //$NON-NLS-1$ + private static final String ENABLE = DISC_COMMON_PREFIX + ".discoveredGroup.buttons.enable.label"; //$NON-NLS-1$ private static final String DELETE = DISC_COMMON_PREFIX + ".discoveredGroup.buttons.delete.label"; //$NON-NLS-1$ private static final String CONTAINER_LABEL = PREFIX + ".title"; //$NON-NLS-1$ @@ -70,16 +70,16 @@ public class DiscoveredPathContainerPage extends WizardPage implements ICPathCon private final int IDX_UP = 0; private final int IDX_DOWN = 1; - private final int IDX_REMOVE = 2; - private final int IDX_RESTORE = 3; + private final int IDX_ENABLE = 2; + private final int IDX_DISABLE = 3; private final int IDX_DELETE = 5; private static final int DISC_UP = 0; private static final int DISC_DOWN = 1; - private static final int DO_REMOVE = 0; - private static final int DO_RESTORE = 1; + private static final int DO_DISABLE = 0; + private static final int DO_ENABLE = 1; private ICProject fCProject; private IContainerEntry fPathEntry; @@ -97,8 +97,8 @@ public class DiscoveredPathContainerPage extends WizardPage implements ICPathCon String[] buttonLabels = new String[]{ /* IDX_UP */ MakeUIPlugin.getResourceString(UP), /* IDX_DOWN */ MakeUIPlugin.getResourceString(DOWN), - /* IDX_REMOVE */MakeUIPlugin.getResourceString(REMOVE), - /* IDX_RESTORE */MakeUIPlugin.getResourceString(RESTORE), + /* IDX_ENABLE */MakeUIPlugin.getResourceString(ENABLE), + /* IDX_DISABLE */MakeUIPlugin.getResourceString(DISABLE), null, /* IDX_DELETE */MakeUIPlugin.getResourceString(DELETE), }; @@ -386,13 +386,13 @@ public class DiscoveredPathContainerPage extends WizardPage implements ICPathCon /* move entry down */ dirty |= moveDown(); break; - case IDX_REMOVE: + case IDX_DISABLE: /* remove */ - dirty |= removeRestoreEntry(DO_REMOVE); + dirty |= enableDisableEntry(DO_DISABLE); break; - case IDX_RESTORE: + case IDX_ENABLE: /* restore */ - dirty |= removeRestoreEntry(DO_RESTORE); + dirty |= enableDisableEntry(DO_ENABLE); break; case IDX_DELETE: /* delete */ @@ -466,9 +466,9 @@ public class DiscoveredPathContainerPage extends WizardPage implements ICPathCon * * @param remove */ - private boolean removeRestoreEntry(int action) { + private boolean enableDisableEntry(int action) { boolean rc = false; - boolean remove = (action == DO_REMOVE); + boolean remove = (action == DO_DISABLE); List selElements = fDiscoveredContainerList.getSelectedElements(); for (int i = selElements.size() - 1; i >= 0; --i) { DiscoveredElement elem = (DiscoveredElement) selElements.get(i); @@ -546,8 +546,8 @@ public class DiscoveredPathContainerPage extends WizardPage implements ICPathCon List selElements = fDiscoveredContainerList.getSelectedElements(); fDiscoveredContainerList.enableButton(IDX_UP, canMoveUpDown(selElements, DISC_UP)); fDiscoveredContainerList.enableButton(IDX_DOWN, canMoveUpDown(selElements, DISC_DOWN)); - fDiscoveredContainerList.enableButton(IDX_REMOVE, canRemoveRestore(selElements)); - fDiscoveredContainerList.enableButton(IDX_RESTORE, canRemoveRestore(selElements)); + fDiscoveredContainerList.enableButton(IDX_DISABLE, canRemoveRestore(selElements)); + fDiscoveredContainerList.enableButton(IDX_ENABLE, canRemoveRestore(selElements)); fDiscoveredContainerList.enableButton(IDX_DELETE, canDelete(selElements)); } /** diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/DiscoveryOptionsBlock.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/DiscoveryOptionsBlock.java index cf468070422..3f8ee70e877 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/DiscoveryOptionsBlock.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/DiscoveryOptionsBlock.java @@ -159,12 +159,14 @@ public class DiscoveryOptionsBlock extends AbstractCOptionPage { if (needsSCNature) { ScannerConfigNature.addScannerConfigNature(getContainer().getProject()); needsSCNature = false; + fCreatePathContainer = true; } buildInfo = MakeCorePlugin.createScannerConfigBuildInfo(project, ScannerConfigBuilder.BUILDER_ID); if (fCreatePathContainer) { createDiscoveredPathContainer(project, monitor); // create a new discovered scanner config store MakeCorePlugin.getDefault().getDiscoveryManager().removeDiscoveredInfo(project); + fCreatePathContainer = false; } } else { buildInfo = MakeCorePlugin.createScannerConfigBuildInfo(fPrefs, ScannerConfigBuilder.BUILDER_ID, false);