From 52c8c083b1bd8c496477854ee32e6e5976636855 Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Mon, 6 May 2013 10:18:20 -0400 Subject: [PATCH] bug 403405: Removed temporary checkbox "Enable language settings providers for this project" from LSP tabs --- .../providers/LanguageSettingsEntriesTab.java | 35 +++---------------- .../LanguageSettingsProviderTab.java | 35 +++---------------- .../cdt/internal/ui/newui/Messages.properties | 1 - 3 files changed, 8 insertions(+), 63 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsEntriesTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsEntriesTab.java index c01dcdcd081..d3d5a04fdbf 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsEntriesTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsEntriesTab.java @@ -79,7 +79,6 @@ public class LanguageSettingsEntriesTab extends AbstractCPropertyTab { private static String currentLanguageIdGlobal = null; private Button builtInCheckBox; - private Button enableProvidersCheckBox; private StatusMessageLine fStatusLine; private LanguageSettingsProvidersPage masterPropertyPage = null; @@ -451,31 +450,6 @@ public class LanguageSettingsEntriesTab extends AbstractCPropertyTab { builtInCheckBox.setEnabled(true); } - /** - * Create check-box to allow disable/enable language settings providers functionality. - */ - private void createEnableProvidersCheckBox() { - // take the flag from master page if available (normally for resource properties) - if (masterPropertyPage != null) { - enableProvidersCheckBox = setupCheck(usercomp, Messages.LanguageSettingsProviders_EnableForProject, 2, GridData.FILL_HORIZONTAL); - enableProvidersCheckBox.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - boolean enabled = enableProvidersCheckBox.getSelection(); - masterPropertyPage.setLanguageSettingsProvidersEnabled(enabled); - enableTabControls(enabled); - updateStatusLine(); - } - }); - - enableProvidersCheckBox.setSelection(masterPropertyPage.isLanguageSettingsProvidersEnabled()); - - // display but disable the checkbox for file/folder resource - enableProvidersCheckBox.setEnabled(page.isForProject()); - enableTabControls(enableProvidersCheckBox.getSelection()); - } - } - @Override public void createControls(Composite parent) { super.createControls(parent); @@ -495,8 +469,8 @@ public class LanguageSettingsEntriesTab extends AbstractCPropertyTab { createSashForm(); fStatusLine = new StatusMessageLine(usercomp, SWT.LEFT, 2); createBuiltInsCheckBox(); - // "I want to try new scanner discovery" temporary checkbox - createEnableProvidersCheckBox(); + + enableTabControls(masterPropertyPage.isLanguageSettingsProvidersEnabled()); initButtons(BUTTON_LABELS); updateData(getResDesc()); @@ -574,7 +548,7 @@ public class LanguageSettingsEntriesTab extends AbstractCPropertyTab { */ private void updateStatusLine() { IStatus status=null; - if (enableProvidersCheckBox.getSelection() == true) { + if (masterPropertyPage.isLanguageSettingsProvidersEnabled()) { ICConfigurationDescription cfgDescription = getConfigurationDescription(); status = LanguageSettingsImages.getStatus(getSelectedEntry(), cfgDescription); } @@ -1034,7 +1008,6 @@ public class LanguageSettingsEntriesTab extends AbstractCPropertyTab { if (masterPropertyPage != null) { boolean enabled = masterPropertyPage.isLanguageSettingsProvidersEnabled(); - enableProvidersCheckBox.setSelection(enabled); enableTabControls(enabled); } } @@ -1114,7 +1087,7 @@ public class LanguageSettingsEntriesTab extends AbstractCPropertyTab { @Override protected void performOK() { - if (masterPropertyPage != null && enableProvidersCheckBox.getEnabled()) { + if (masterPropertyPage != null && masterPropertyPage.isLanguageSettingsProvidersEnabled()) { masterPropertyPage.applyLanguageSettingsProvidersEnabled(); } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProviderTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProviderTab.java index 9a008a05f5c..d33be1c7523 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProviderTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProviderTab.java @@ -93,7 +93,6 @@ public class LanguageSettingsProviderTab extends AbstractCPropertyTab { private ICOptionPage currentOptionsPage = null; private Composite compositeOptionsPage; - private Button enableProvidersCheckBox; private StatusMessageLine fStatusLine; private Button sharedProviderCheckBox = null; @@ -652,30 +651,6 @@ public class LanguageSettingsProviderTab extends AbstractCPropertyTab { } } - /** - * Create check-box to allow disable/enable language settings providers functionality. - */ - private void createEnableProvidersCheckBox() { - // take the flag from master page if available (normally for resource properties) - if (masterPropertyPage != null) { - enableProvidersCheckBox = setupCheck(usercomp, Messages.LanguageSettingsProviders_EnableForProject, 2, GridData.FILL_HORIZONTAL); - enableProvidersCheckBox.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - boolean enabled = enableProvidersCheckBox.getSelection(); - masterPropertyPage.setLanguageSettingsProvidersEnabled(enabled); - enableTabControls(enabled); - } - }); - - enableProvidersCheckBox.setSelection(masterPropertyPage.isLanguageSettingsProvidersEnabled()); - - // display but disable the checkbox for file/folder resource - enableProvidersCheckBox.setEnabled(page.isForProject()); - enableTabControls(enableProvidersCheckBox.getSelection()); - } - } - @Override public void createControls(Composite parent) { super.createControls(parent); @@ -695,7 +670,7 @@ public class LanguageSettingsProviderTab extends AbstractCPropertyTab { fStatusLine = new StatusMessageLine(usercomp, SWT.LEFT, 2); if (!page.isForPrefs()) { - createEnableProvidersCheckBox(); + enableTabControls(masterPropertyPage.isLanguageSettingsProvidersEnabled()); } String[] buttonLabels; @@ -1107,7 +1082,6 @@ public class LanguageSettingsProviderTab extends AbstractCPropertyTab { if (masterPropertyPage != null) { boolean enabled = masterPropertyPage.isLanguageSettingsProvidersEnabled(); - enableProvidersCheckBox.setSelection(enabled); enableTabControls(enabled); } } @@ -1123,15 +1097,14 @@ public class LanguageSettingsProviderTab extends AbstractCPropertyTab { @Override protected void performDefaults() { - if (page.isForProject() && (enableProvidersCheckBox==null || enableProvidersCheckBox.getSelection() == false)) - return; - if (page.isForPrefs() || page.isForProject()) { if (MessageDialog.openQuestion(usercomp.getShell(), Messages.LanguageSettingsProviderTab_TitleResetProviders, Messages.LanguageSettingsProviderTab_AreYouSureToResetProviders)) { if (page.isForProject()) { + // set project LSP enablement to that of workspace + masterPropertyPage.setLanguageSettingsProvidersEnabled(ScannerDiscoveryLegacySupport.isLanguageSettingsProvidersFunctionalityEnabled(null)); ICConfigurationDescription cfgDescription = getConfigurationDescription(); if (cfgDescription instanceof ILanguageSettingsProvidersKeeper) { List cfgProviders = new ArrayList(((ILanguageSettingsProvidersKeeper) cfgDescription).getLanguageSettingProviders()); @@ -1207,7 +1180,7 @@ public class LanguageSettingsProviderTab extends AbstractCPropertyTab { initializeProviders(); } - if (masterPropertyPage != null && enableProvidersCheckBox.getEnabled()) { + if (masterPropertyPage != null && masterPropertyPage.isLanguageSettingsProvidersEnabled()) { masterPropertyPage.applyLanguageSettingsProvidersEnabled(); } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/newui/Messages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/newui/Messages.properties index 839d769eab1..1c839717ec2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/newui/Messages.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/newui/Messages.properties @@ -192,7 +192,6 @@ LanguageSettingsImages_FileDoesNotExist=The selected file does not exist or not LanguageSettingsImages_FolderDoesNotExist=The selected folder does not exist or not accessible. LanguageSettingsImages_UsingRelativePathsNotRecommended=Using relative paths is ambiguous and not recommended. It can cause unexpected effects. -LanguageSettingsProviders_EnableForProject=Enable language settings providers for this project LanguageSettingsProvidersLabelProvider_TextDecorator_Shared=\ \ \ [ Shared ] LanguageSettingsProviderTab_AreYouSureToResetProviders=Are you sure you want to reset all customized language settings providers?\nPlease note that providers may regain entries on their own schedule. LanguageSettingsProviderTab_Clear=Clear Entries