From 53b2453e3f58012ab8c1eb584f8143a2c22c794d Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Thu, 4 Aug 2011 16:28:17 -0400 Subject: [PATCH] Trying a bit different wording for global workspace provider --- .../providers/LanguageSettingsProviderTab.java | 2 +- .../LanguageSettingsProvidersLabelProvider.java | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) 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 afcc404fad5..784fc9bfc8d 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 @@ -389,7 +389,7 @@ public class LanguageSettingsProviderTab extends AbstractCPropertyTab { if (!page.isForPrefs()) { if (globalProviderCheckBox==null) { globalProviderCheckBox = new Button(groupOptionsPage, SWT.CHECK); - globalProviderCheckBox.setText("Use global provider sharing settings among projects"); + globalProviderCheckBox.setText("Share setting entries between projects (global provider)"); globalProviderCheckBox.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProvidersLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProvidersLabelProvider.java index 0a810a02498..45064253876 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProvidersLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProvidersLabelProvider.java @@ -107,10 +107,15 @@ class LanguageSettingsProvidersLabelProvider extends LabelProvider { @Override public String getText(Object element) { if (element instanceof ILanguageSettingsProvider) { - String name = ((ILanguageSettingsProvider) element).getName(); - if (name!=null) + ILanguageSettingsProvider provider = (ILanguageSettingsProvider) element; + String name = provider.getName(); + if (name!=null) { + if (LanguageSettingsManager.isWorkspaceProvider(provider)) { + name = name + " [ Shared ]"; + } return name; - String id = ((ILanguageSettingsProvider) element).getId(); + } + String id = provider.getId(); return "[ Not accessible id="+id+" ]"; } return OOPS;