From d8796f4c42cf7267cbb461e32937122d1c70b0c6 Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Wed, 19 Jun 2013 21:15:27 -0700 Subject: [PATCH] Relaxed type constraints in ILanguageSettingsProvidersKeeper.setLanguageSettingProviders method Change-Id: I01ad2e017ba1b86f0fe0a476b2189a2fe5b5547e Reviewed-on: https://git.eclipse.org/r/13942 Reviewed-by: Andrew Gvozdev IP-Clean: Andrew Gvozdev Tested-by: Andrew Gvozdev --- .../settings/providers/LanguageSettingsManagerTests.java | 2 +- .../providers/LanguageSettingsPersistenceProjectTests.java | 2 +- .../providers/ILanguageSettingsProvidersKeeper.java | 2 +- .../core/settings/model/CConfigurationDescription.java | 2 +- .../core/settings/model/CConfigurationDescriptionCache.java | 2 +- .../core/settings/model/CConfigurationSpecSettings.java | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsManagerTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsManagerTests.java index 702606a4ed9..698c32bd2f7 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsManagerTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsManagerTests.java @@ -68,7 +68,7 @@ public class LanguageSettingsManagerTests extends BaseTestCase { super(id); } @Override - public void setLanguageSettingProviders(List providers) { + public void setLanguageSettingProviders(List providers) { this.providers = new ArrayList(providers); } @Override diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsPersistenceProjectTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsPersistenceProjectTests.java index 36cd3c7e28a..c7dae3dba15 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsPersistenceProjectTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsPersistenceProjectTests.java @@ -75,7 +75,7 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase { super(id); } @Override - public void setLanguageSettingProviders(List providers) { + public void setLanguageSettingProviders(List providers) { this.providers = new ArrayList(providers); } @Override diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/settings/providers/ILanguageSettingsProvidersKeeper.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/settings/providers/ILanguageSettingsProvidersKeeper.java index d159e785a4c..537f331d04d 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/settings/providers/ILanguageSettingsProvidersKeeper.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/settings/providers/ILanguageSettingsProvidersKeeper.java @@ -34,7 +34,7 @@ public interface ILanguageSettingsProvidersKeeper { * to the registered listeners about the accompanied changes in settings entries, see * {@link LanguageSettingsManager#registerLanguageSettingsChangeListener(ILanguageSettingsChangeListener)}. */ - public void setLanguageSettingProviders(List providers); + public void setLanguageSettingProviders(List providers); /** * Returns the list of language settings providers. Language settings providers are diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CConfigurationDescription.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CConfigurationDescription.java index c3e01c007ef..e84d00b9fdc 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CConfigurationDescription.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CConfigurationDescription.java @@ -845,7 +845,7 @@ public class CConfigurationDescription extends CDataProxyContainer } @Override - public void setLanguageSettingProviders(List providers) { + public void setLanguageSettingProviders(List providers) { try { getSpecSettings().setLanguageSettingProviders(providers); } catch (CoreException e) { diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CConfigurationDescriptionCache.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CConfigurationDescriptionCache.java index a2e473fe27e..a5de406d6ad 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CConfigurationDescriptionCache.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CConfigurationDescriptionCache.java @@ -623,7 +623,7 @@ public class CConfigurationDescriptionCache extends CDefaultConfigurationData } @Override - public void setLanguageSettingProviders(List providers) { + public void setLanguageSettingProviders(List providers) { if(!fInitializing) throw ExceptionFactory.createIsReadOnlyException(); fSpecSettings.setLanguageSettingProviders(providers); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CConfigurationSpecSettings.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CConfigurationSpecSettings.java index 10c52b88f47..62a95c1eb73 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CConfigurationSpecSettings.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CConfigurationSpecSettings.java @@ -203,14 +203,14 @@ public class CConfigurationSpecSettings implements ICSettingsStorage, ILanguageS if (base.fLanguageSettingsProviders != null) { fLanguageSettingsProviders = LanguageSettingsProvidersSerializer.cloneProviders(base.fLanguageSettingsProviders); } else { - fLanguageSettingsProviders = base.fLanguageSettingsProviders; + fLanguageSettingsProviders = null; } for (String providerId : base.lspPersistedState.keySet()) { try { LanguageSettingsStorage clone = base.lspPersistedState.get(providerId).clone(); lspPersistedState.put(providerId, clone); } catch (CloneNotSupportedException e) { - CCorePlugin.log("Not able to clone language settings storage:" + e); //$NON-NLS-1$ + CCorePlugin.log("Not able to clone language settings storage: " + e); //$NON-NLS-1$ } } } @@ -1019,7 +1019,7 @@ public class CConfigurationSpecSettings implements ICSettingsStorage, ILanguageS * @param providers - list of providers to keep in the specs. */ @Override - public void setLanguageSettingProviders(List providers) { + public void setLanguageSettingProviders(List providers) { fLanguageSettingsProviders = new ArrayList(0); Set ids = new HashSet(); for (ILanguageSettingsProvider provider : providers) {