mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 14:42:11 +02:00
Code Issues Wiki Activity

Relaxed type constraints in

Browse source 
ILanguageSettingsProvidersKeeper.setLanguageSettingProviders method

Change-Id: I01ad2e017ba1b86f0fe0a476b2189a2fe5b5547e
Reviewed-on: https://git.eclipse.org/r/13942
Reviewed-by: Andrew Gvozdev <angvoz.dev@gmail.com>
IP-Clean: Andrew Gvozdev <angvoz.dev@gmail.com>
Tested-by: Andrew Gvozdev <angvoz.dev@gmail.com>
This commit is contained in:
Sergey Prigogin 2013-06-19 21:15:27 -07:00 • committed by Andrew Gvozdev
parent fdebc23ebe
commit d8796f4c42
6 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsManagerTests.java
View file

@ -68,7 +68,7 @@ public class LanguageSettingsManagerTests extends BaseTestCase {
super(id); super(id);
} }
@Override @Override
public void setLanguageSettingProviders(List<ILanguageSettingsProvider> providers) { public void setLanguageSettingProviders(List<? extends ILanguageSettingsProvider> providers) {
this.providers = new ArrayList<ILanguageSettingsProvider>(providers); this.providers = new ArrayList<ILanguageSettingsProvider>(providers);
} }
@Override @Override

2
core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsPersistenceProjectTests.java
View file

@ -75,7 +75,7 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase {
super(id); super(id);
} }
@Override @Override
public void setLanguageSettingProviders(List<ILanguageSettingsProvider> providers) { public void setLanguageSettingProviders(List<? extends ILanguageSettingsProvider> providers) {
this.providers = new ArrayList<ILanguageSettingsProvider>(providers); this.providers = new ArrayList<ILanguageSettingsProvider>(providers);
} }
@Override @Override

2
core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/settings/providers/ILanguageSettingsProvidersKeeper.java
View file

@ -34,7 +34,7 @@ public interface ILanguageSettingsProvidersKeeper {
* to the registered listeners about the accompanied changes in settings entries, see * to the registered listeners about the accompanied changes in settings entries, see
* {@link LanguageSettingsManager#registerLanguageSettingsChangeListener(ILanguageSettingsChangeListener)}. * {@link LanguageSettingsManager#registerLanguageSettingsChangeListener(ILanguageSettingsChangeListener)}.
*/ */
public void setLanguageSettingProviders(List<ILanguageSettingsProvider> providers); public void setLanguageSettingProviders(List<? extends ILanguageSettingsProvider> providers);
/** /**
* Returns the list of language settings providers. Language settings providers are * Returns the list of language settings providers. Language settings providers are

2
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CConfigurationDescription.java
View file

@ -845,7 +845,7 @@ public class CConfigurationDescription extends CDataProxyContainer
} }
@Override @Override
public void setLanguageSettingProviders(List<ILanguageSettingsProvider> providers) { public void setLanguageSettingProviders(List<? extends ILanguageSettingsProvider> providers) {
try { try {
getSpecSettings().setLanguageSettingProviders(providers); getSpecSettings().setLanguageSettingProviders(providers);
} catch (CoreException e) { } catch (CoreException e) {

2
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CConfigurationDescriptionCache.java
View file

@ -623,7 +623,7 @@ public class CConfigurationDescriptionCache extends CDefaultConfigurationData
} }
@Override @Override
public void setLanguageSettingProviders(List<ILanguageSettingsProvider> providers) { public void setLanguageSettingProviders(List<? extends ILanguageSettingsProvider> providers) {
if(!fInitializing) if(!fInitializing)
throw ExceptionFactory.createIsReadOnlyException(); throw ExceptionFactory.createIsReadOnlyException();
fSpecSettings.setLanguageSettingProviders(providers); fSpecSettings.setLanguageSettingProviders(providers);

6
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CConfigurationSpecSettings.java
View file

@ -203,14 +203,14 @@ public class CConfigurationSpecSettings implements ICSettingsStorage, ILanguageS
if (base.fLanguageSettingsProviders != null) { if (base.fLanguageSettingsProviders != null) {
fLanguageSettingsProviders = LanguageSettingsProvidersSerializer.cloneProviders(base.fLanguageSettingsProviders); fLanguageSettingsProviders = LanguageSettingsProvidersSerializer.cloneProviders(base.fLanguageSettingsProviders);
} else { } else {
fLanguageSettingsProviders = base.fLanguageSettingsProviders; fLanguageSettingsProviders = null;
} }
for (String providerId : base.lspPersistedState.keySet()) { for (String providerId : base.lspPersistedState.keySet()) {
try { try {
LanguageSettingsStorage clone = base.lspPersistedState.get(providerId).clone(); LanguageSettingsStorage clone = base.lspPersistedState.get(providerId).clone();
lspPersistedState.put(providerId, clone); lspPersistedState.put(providerId, clone);
} catch (CloneNotSupportedException e) { } 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. * @param providers - list of providers to keep in the specs.
*/ */
@Override @Override
public void setLanguageSettingProviders(List<ILanguageSettingsProvider> providers) { public void setLanguageSettingProviders(List<? extends ILanguageSettingsProvider> providers) {
fLanguageSettingsProviders = new ArrayList<ILanguageSettingsProvider>(0); fLanguageSettingsProviders = new ArrayList<ILanguageSettingsProvider>(0);
Set<String> ids = new HashSet<String>(); Set<String> ids = new HashSet<String>();
for (ILanguageSettingsProvider provider : providers) { for (ILanguageSettingsProvider provider : providers) {