mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

bug 403405: Removed temporary checkbox "Enable language settings providers for this project" from LSP tabs

Browse source
This commit is contained in:
Andrew Gvozdev 2013-05-06 10:18:20 -04:00
parent c0ff399bea
commit 52c8c083b1
3 changed files with 8 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsEntriesTab.java
View file

@ -79,7 +79,6 @@ public class LanguageSettingsEntriesTab extends AbstractCPropertyTab {
private static String currentLanguageIdGlobal = null; private static String currentLanguageIdGlobal = null;
private Button builtInCheckBox; private Button builtInCheckBox;
private Button enableProvidersCheckBox;
private StatusMessageLine fStatusLine; private StatusMessageLine fStatusLine;
private LanguageSettingsProvidersPage masterPropertyPage = null; private LanguageSettingsProvidersPage masterPropertyPage = null;
@ -451,31 +450,6 @@ public class LanguageSettingsEntriesTab extends AbstractCPropertyTab {
builtInCheckBox.setEnabled(true); 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 @Override
public void createControls(Composite parent) { public void createControls(Composite parent) {
super.createControls(parent); super.createControls(parent);
@ -495,8 +469,8 @@ public class LanguageSettingsEntriesTab extends AbstractCPropertyTab {
createSashForm(); createSashForm();
fStatusLine = new StatusMessageLine(usercomp, SWT.LEFT, 2); fStatusLine = new StatusMessageLine(usercomp, SWT.LEFT, 2);
createBuiltInsCheckBox(); createBuiltInsCheckBox();
// "I want to try new scanner discovery" temporary checkbox
createEnableProvidersCheckBox(); enableTabControls(masterPropertyPage.isLanguageSettingsProvidersEnabled());
initButtons(BUTTON_LABELS); initButtons(BUTTON_LABELS);
updateData(getResDesc()); updateData(getResDesc());
@ -574,7 +548,7 @@ public class LanguageSettingsEntriesTab extends AbstractCPropertyTab {
*/ */
private void updateStatusLine() { private void updateStatusLine() {
IStatus status=null; IStatus status=null;
if (enableProvidersCheckBox.getSelection() == true) { if (masterPropertyPage.isLanguageSettingsProvidersEnabled()) {
ICConfigurationDescription cfgDescription = getConfigurationDescription(); ICConfigurationDescription cfgDescription = getConfigurationDescription();
status = LanguageSettingsImages.getStatus(getSelectedEntry(), cfgDescription); status = LanguageSettingsImages.getStatus(getSelectedEntry(), cfgDescription);
} }
@ -1034,7 +1008,6 @@ public class LanguageSettingsEntriesTab extends AbstractCPropertyTab {
if (masterPropertyPage != null) { if (masterPropertyPage != null) {
boolean enabled = masterPropertyPage.isLanguageSettingsProvidersEnabled(); boolean enabled = masterPropertyPage.isLanguageSettingsProvidersEnabled();
enableProvidersCheckBox.setSelection(enabled);
enableTabControls(enabled); enableTabControls(enabled);
} }
} }
@ -1114,7 +1087,7 @@ public class LanguageSettingsEntriesTab extends AbstractCPropertyTab {
@Override @Override
protected void performOK() { protected void performOK() {
if (masterPropertyPage != null && enableProvidersCheckBox.getEnabled()) { if (masterPropertyPage != null && masterPropertyPage.isLanguageSettingsProvidersEnabled()) {
masterPropertyPage.applyLanguageSettingsProvidersEnabled(); masterPropertyPage.applyLanguageSettingsProvidersEnabled();
} }
} }

35
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProviderTab.java
View file

@ -93,7 +93,6 @@ public class LanguageSettingsProviderTab extends AbstractCPropertyTab {
private ICOptionPage currentOptionsPage = null; private ICOptionPage currentOptionsPage = null;
private Composite compositeOptionsPage; private Composite compositeOptionsPage;
private Button enableProvidersCheckBox;
private StatusMessageLine fStatusLine; private StatusMessageLine fStatusLine;
private Button sharedProviderCheckBox = null; 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 @Override
public void createControls(Composite parent) { public void createControls(Composite parent) {
super.createControls(parent); super.createControls(parent);
@ -695,7 +670,7 @@ public class LanguageSettingsProviderTab extends AbstractCPropertyTab {
fStatusLine = new StatusMessageLine(usercomp, SWT.LEFT, 2); fStatusLine = new StatusMessageLine(usercomp, SWT.LEFT, 2);
if (!page.isForPrefs()) { if (!page.isForPrefs()) {
createEnableProvidersCheckBox(); enableTabControls(masterPropertyPage.isLanguageSettingsProvidersEnabled());
} }
String[] buttonLabels; String[] buttonLabels;
@ -1107,7 +1082,6 @@ public class LanguageSettingsProviderTab extends AbstractCPropertyTab {
if (masterPropertyPage != null) { if (masterPropertyPage != null) {
boolean enabled = masterPropertyPage.isLanguageSettingsProvidersEnabled(); boolean enabled = masterPropertyPage.isLanguageSettingsProvidersEnabled();
enableProvidersCheckBox.setSelection(enabled);
enableTabControls(enabled); enableTabControls(enabled);
} }
} }
@ -1123,15 +1097,14 @@ public class LanguageSettingsProviderTab extends AbstractCPropertyTab {
@Override @Override
protected void performDefaults() { protected void performDefaults() {
if (page.isForProject() && (enableProvidersCheckBox==null || enableProvidersCheckBox.getSelection() == false))
return;
if (page.isForPrefs() || page.isForProject()) { if (page.isForPrefs() || page.isForProject()) {
if (MessageDialog.openQuestion(usercomp.getShell(), if (MessageDialog.openQuestion(usercomp.getShell(),
Messages.LanguageSettingsProviderTab_TitleResetProviders, Messages.LanguageSettingsProviderTab_TitleResetProviders,
Messages.LanguageSettingsProviderTab_AreYouSureToResetProviders)) { Messages.LanguageSettingsProviderTab_AreYouSureToResetProviders)) {
if (page.isForProject()) { if (page.isForProject()) {
// set project LSP enablement to that of workspace
masterPropertyPage.setLanguageSettingsProvidersEnabled(ScannerDiscoveryLegacySupport.isLanguageSettingsProvidersFunctionalityEnabled(null));
ICConfigurationDescription cfgDescription = getConfigurationDescription(); ICConfigurationDescription cfgDescription = getConfigurationDescription();
if (cfgDescription instanceof ILanguageSettingsProvidersKeeper) { if (cfgDescription instanceof ILanguageSettingsProvidersKeeper) {
List<ILanguageSettingsProvider> cfgProviders = new ArrayList<ILanguageSettingsProvider>(((ILanguageSettingsProvidersKeeper) cfgDescription).getLanguageSettingProviders()); List<ILanguageSettingsProvider> cfgProviders = new ArrayList<ILanguageSettingsProvider>(((ILanguageSettingsProvidersKeeper) cfgDescription).getLanguageSettingProviders());
@ -1207,7 +1180,7 @@ public class LanguageSettingsProviderTab extends AbstractCPropertyTab {
initializeProviders(); initializeProviders();
} }
if (masterPropertyPage != null && enableProvidersCheckBox.getEnabled()) { if (masterPropertyPage != null && masterPropertyPage.isLanguageSettingsProvidersEnabled()) {
masterPropertyPage.applyLanguageSettingsProvidersEnabled(); masterPropertyPage.applyLanguageSettingsProvidersEnabled();
} }
} }

1
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/newui/Messages.properties
View file

@ -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_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. 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 ] 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_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 LanguageSettingsProviderTab_Clear=Clear Entries