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

Renamed LanguageSettingsSerializable ->

Browse source 
LanguageSettingsSerializableProvider
This commit is contained in:
Andrew Gvozdev 2011-11-18 17:09:21 -05:00
parent 1415806f83
commit 10dd44163a
22 changed files with 209 additions and 207 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/scannerconfig/AbstractLanguageSettingsOutputScanner.java
View file

@ -30,7 +30,7 @@ import org.eclipse.cdt.core.ErrorParserManager;
import org.eclipse.cdt.core.cdtvariables.CdtVariableException;
import org.eclipse.cdt.core.cdtvariables.ICdtVariableManager;
import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsManager;
import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsSerializable;
import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsSerializableProvider;
import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry;
import org.eclipse.cdt.core.settings.model.ICSettingEntry;
@ -54,7 +54,7 @@ import org.eclipse.core.runtime.content.IContentType;
import org.eclipse.core.runtime.content.IContentTypeManager;
import org.w3c.dom.Element;
public abstract class AbstractLanguageSettingsOutputScanner extends LanguageSettingsSerializable {
public abstract class AbstractLanguageSettingsOutputScanner extends LanguageSettingsSerializableProvider {
protected static final String ATTR_EXPAND_RELATIVE_PATHS = "expand-relative-paths"; //$NON-NLS-1$

6
core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsExtensionsTests.java
View file

@ -236,8 +236,8 @@ public class LanguageSettingsExtensionsTests extends BaseTestCase {
// get raw extension provider
ILanguageSettingsProvider rawProvider = LanguageSettingsManager.getRawProvider(providerExt);
assertTrue(rawProvider instanceof LanguageSettingsSerializable);
LanguageSettingsSerializable provider = (LanguageSettingsSerializable) rawProvider;
assertTrue(rawProvider instanceof LanguageSettingsSerializableProvider);
LanguageSettingsSerializableProvider provider = (LanguageSettingsSerializableProvider) rawProvider;
assertEquals(null, provider.getLanguageScope());
assertEquals("", provider.getCustomParameter());
@ -259,7 +259,7 @@ public class LanguageSettingsExtensionsTests extends BaseTestCase {
// get raw extension provider
ILanguageSettingsProvider rawProvider = LanguageSettingsManager.getRawProvider(providerExt);
assertTrue(rawProvider instanceof LanguageSettingsSerializable);
assertTrue(rawProvider instanceof LanguageSettingsSerializableProvider);
assertTrue(LanguageSettingsExtensionManager.equalsExtensionProvider(rawProvider));
// compare with workspace provider

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

@ -696,7 +696,7 @@ public class LanguageSettingsManagerTests extends BaseTestCase {
ILanguageSettingsProvider rawProvider = LanguageSettingsManager.getRawProvider(provider);
assertEquals(EXTENSION_EDITABLE_PROVIDER_ID, rawProvider.getId());
assertEquals(EXTENSION_EDITABLE_PROVIDER_NAME, rawProvider.getName());
assertTrue(rawProvider instanceof LanguageSettingsSerializable);
assertTrue(rawProvider instanceof LanguageSettingsSerializableProvider);
// assert they are not the same object
assertNotSame(provider, rawProvider);
@ -713,7 +713,7 @@ public class LanguageSettingsManagerTests extends BaseTestCase {
List<ICLanguageSettingEntry> newEntries = new ArrayList<ICLanguageSettingEntry>();
newEntries.add(new CIncludePathEntry("path0", 0));
newEntries.add(new CIncludePathEntry("path1", 0));
((LanguageSettingsSerializable)rawProvider).setSettingEntries(null, null, null, newEntries);
((LanguageSettingsSerializableProvider)rawProvider).setSettingEntries(null, null, null, newEntries);
// check that the workspace provider gets them too
List<ICLanguageSettingEntry> newRawEntries = rawProvider.getSettingEntries(null, null, null);
@ -752,7 +752,7 @@ public class LanguageSettingsManagerTests extends BaseTestCase {
{
// replace raw provider
List<ILanguageSettingsProvider> providers = new ArrayList<ILanguageSettingsProvider>();
LanguageSettingsSerializable newRawProvider = new LanguageSettingsSerializable(EXTENSION_EDITABLE_PROVIDER_ID, PROVIDER_NAME_0);
LanguageSettingsSerializableProvider newRawProvider = new LanguageSettingsSerializableProvider(EXTENSION_EDITABLE_PROVIDER_ID, PROVIDER_NAME_0);
newRawProvider.setSettingEntries(null, null, null, newEntries);
providers.add(newRawProvider);
LanguageSettingsManager.setWorkspaceProviders(providers);
@ -800,7 +800,7 @@ public class LanguageSettingsManagerTests extends BaseTestCase {
assertNotNull(file);
// create a provider and set the entries
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(PROVIDER_1, PROVIDER_NAME_1);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
provider.setSettingEntries(null, file, null, entries);
// build the hierarchy
LanguageSettingsProvidersSerializer.buildResourceTree(provider, null, null, project);
@ -824,7 +824,7 @@ public class LanguageSettingsManagerTests extends BaseTestCase {
IFile file = ResourceHelper.createFile(project, "Folder/file.cpp");
// create a provider and set the entries
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(PROVIDER_1, PROVIDER_NAME_1);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
provider.setSettingEntries(null, file, null, entries);
// build the hierarchy
LanguageSettingsManager.buildResourceTree(provider, null, null, project);
@ -852,7 +852,7 @@ public class LanguageSettingsManagerTests extends BaseTestCase {
IFile file2 = ResourceHelper.createFile(project, "Folder2/file2.cpp");
// create a provider and set the entries
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(PROVIDER_1, PROVIDER_NAME_1);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
provider.setSettingEntries(null, file1, null, entries1);
provider.setSettingEntries(null, file2, null, entries2);
// build the hierarchy
@ -884,7 +884,7 @@ public class LanguageSettingsManagerTests extends BaseTestCase {
IFile file3 = ResourceHelper.createFile(project, "file3.cpp");
// create a provider
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(PROVIDER_1, PROVIDER_NAME_1);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
// set the entries for the first 2 files
provider.setSettingEntries(null, file1, null, entries1);
@ -922,7 +922,7 @@ public class LanguageSettingsManagerTests extends BaseTestCase {
IFile file = ResourceHelper.createFile(project, "Folder/file.cpp");
// create a provider and set the entries
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(PROVIDER_1, PROVIDER_NAME_1);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
provider.setSettingEntries(null, file, LANG_CPP, entries);
// build the hierarchy
LanguageSettingsManager.buildResourceTree(provider, null, LANG_CPP, project);

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

@ -103,7 +103,7 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase {
}
}
private class MockEditableProvider extends LanguageSettingsSerializable implements ILanguageSettingsEditableProvider {
private class MockEditableProvider extends LanguageSettingsSerializableProvider implements ILanguageSettingsEditableProvider {
public MockEditableProvider(String id, String name) {
super(id, name);
}
@ -189,7 +189,7 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase {
public void testProjectDescription_PreventBackDoorAccess() throws Exception {
// create a project
IProject project = ResourceHelper.createCDTProjectWithConfig(getName());
// get project descriptions
ICProjectDescription writableProjDescription = coreModel.getProjectDescription(project);
assertNotNull(writableProjDescription);
@ -198,13 +198,13 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase {
ICConfigurationDescription cfgDescription = cfgDescriptions[0];
List<ILanguageSettingsProvider> originalProviders = cfgDescription.getLanguageSettingProviders();
int originalSize = originalProviders.size();
// create new provider list
LanguageSettingsSerializable mockProvider = new MockEditableProvider(PROVIDER_0, PROVIDER_NAME_0);
LanguageSettingsSerializableProvider mockProvider = new MockEditableProvider(PROVIDER_0, PROVIDER_NAME_0);
List<ILanguageSettingsProvider> providers = new ArrayList<ILanguageSettingsProvider>(originalProviders);
providers.add(mockProvider);
assertTrue(originalSize != providers.size());
// changing providers shouldn't affect the original list
cfgDescription.setLanguageSettingProviders(providers);
assertEquals(originalSize, originalProviders.size());
@ -215,14 +215,14 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase {
public void testProjectDescription_ReadWriteProviders() throws Exception {
// create a project
IProject project = ResourceHelper.createCDTProjectWithConfig(getName());
{
// get read-only description
ICProjectDescription prjDescription = CProjectDescriptionManager.getInstance().getProjectDescription(project, false);
assertNotNull(prjDescription);
ICConfigurationDescription cfgDescription = prjDescription.getDefaultSettingConfiguration();
assertNotNull(cfgDescription);
// try to write to it
try {
List<ILanguageSettingsProvider> providers = new ArrayList<ILanguageSettingsProvider>();
@ -232,10 +232,10 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase {
// exception is expected
}
}
List<ICLanguageSettingEntry> entries = new ArrayList<ICLanguageSettingEntry>();
entries.add(new CIncludePathEntry("path0", 0));
{
// get project descriptions
ICProjectDescription writableProjDescription = coreModel.getProjectDescription(project);
@ -243,9 +243,9 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase {
ICConfigurationDescription[] cfgDescriptions = writableProjDescription.getConfigurations();
assertEquals(1, cfgDescriptions.length);
ICConfigurationDescription cfgDescription = cfgDescriptions[0];
// create a provider
LanguageSettingsSerializable mockProvider = new MockEditableProvider(PROVIDER_0, PROVIDER_NAME_0);
LanguageSettingsSerializableProvider mockProvider = new MockEditableProvider(PROVIDER_0, PROVIDER_NAME_0);
mockProvider.setStoringEntriesInProjectArea(true);
mockProvider.setSettingEntries(cfgDescription, null, null, entries);
List<ILanguageSettingsProvider> providers = new ArrayList<ILanguageSettingsProvider>();
@ -253,7 +253,7 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase {
cfgDescription.setLanguageSettingProviders(providers);
List<ILanguageSettingsProvider> storedProviders = cfgDescription.getLanguageSettingProviders();
assertEquals(1, storedProviders.size());
// apply new project description to the project model
coreModel.setProjectDescription(project, writableProjDescription);
}
@ -264,14 +264,14 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase {
ICConfigurationDescription[] cfgDescriptions = readOnlyProjDescription.getConfigurations();
assertEquals(1, cfgDescriptions.length);
ICConfigurationDescription cfgDescription = cfgDescriptions[0];
List<ILanguageSettingsProvider> providers = cfgDescription.getLanguageSettingProviders();
assertEquals(1, providers.size());
ILanguageSettingsProvider loadedProvider = providers.get(0);
assertTrue(loadedProvider instanceof LanguageSettingsSerializable);
assertTrue(loadedProvider instanceof LanguageSettingsSerializableProvider);
assertEquals(PROVIDER_0, loadedProvider.getId());
assertEquals(PROVIDER_NAME_0, loadedProvider.getName());
List<ICLanguageSettingEntry> actual = loadedProvider.getSettingEntries(cfgDescription, null, null);
assertEquals(entries.get(0), actual.get(0));
assertEquals(entries.size(), actual.size());
@ -283,20 +283,20 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase {
ICConfigurationDescription[] cfgDescriptions = writableProjDescription.getConfigurations();
assertEquals(1, cfgDescriptions.length);
ICConfigurationDescription cfgDescription = cfgDescriptions[0];
List<ILanguageSettingsProvider> providers = cfgDescription.getLanguageSettingProviders();
assertEquals(1, providers.size());
ILanguageSettingsProvider loadedProvider = providers.get(0);
assertTrue(loadedProvider instanceof LanguageSettingsSerializable);
assertTrue(loadedProvider instanceof LanguageSettingsSerializableProvider);
assertEquals(PROVIDER_0, loadedProvider.getId());
assertEquals(PROVIDER_NAME_0, loadedProvider.getName());
List<ICLanguageSettingEntry> actual = loadedProvider.getSettingEntries(cfgDescription, null, null);
assertEquals(entries.get(0), actual.get(0));
assertEquals(entries.size(), actual.size());
}
}
/**
*/
public void testWorkspacePersistence_ModifiedExtensionProvider() throws Exception {
@ -306,7 +306,7 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase {
{
// get the raw extension provider
ILanguageSettingsProvider provider = LanguageSettingsManager.getWorkspaceProvider(EXTENSION_SERIALIZABLE_PROVIDER_ID);
LanguageSettingsSerializable extProvider = (LanguageSettingsSerializable) LanguageSettingsManager.getRawProvider(provider);
LanguageSettingsSerializableProvider extProvider = (LanguageSettingsSerializableProvider) LanguageSettingsManager.getRawProvider(provider);
assertNotNull(extProvider);
assertEquals(EXTENSION_SERIALIZABLE_PROVIDER_ID, extProvider.getId());
@ -347,7 +347,7 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase {
{
// get the raw extension provider
ILanguageSettingsProvider provider = LanguageSettingsManager.getWorkspaceProvider(EXTENSION_SERIALIZABLE_PROVIDER_ID);
LanguageSettingsSerializable rawProvider = (LanguageSettingsSerializable) LanguageSettingsManager.getRawProvider(provider);
LanguageSettingsSerializableProvider rawProvider = (LanguageSettingsSerializableProvider) LanguageSettingsManager.getRawProvider(provider);
assertNotNull(rawProvider);
assertEquals(EXTENSION_SERIALIZABLE_PROVIDER_ID, rawProvider.getId());
@ -365,7 +365,7 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase {
{
// check that it has not cleared
ILanguageSettingsProvider provider = LanguageSettingsManager.getWorkspaceProvider(EXTENSION_SERIALIZABLE_PROVIDER_ID);
LanguageSettingsSerializable rawProvider = (LanguageSettingsSerializable) LanguageSettingsManager.getRawProvider(provider);
LanguageSettingsSerializableProvider rawProvider = (LanguageSettingsSerializableProvider) LanguageSettingsManager.getRawProvider(provider);
assertEquals(CUSTOM_PARAMETER, rawProvider.getCustomParameter());
}
}
@ -450,7 +450,7 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase {
ICConfigurationDescription cfgDescription = cfgDescriptions[0];
assertNotNull(cfgDescription);
LanguageSettingsSerializable serializableProvider = new LanguageSettingsSerializable(PROVIDER_0, PROVIDER_NAME_0);
LanguageSettingsSerializableProvider serializableProvider = new LanguageSettingsSerializableProvider(PROVIDER_0, PROVIDER_NAME_0);
serializableProvider.setSettingEntries(null, null, null, entries);
serializableProvider.setStoringEntriesInProjectArea(true);
@ -479,7 +479,7 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase {
assertNotNull(providers);
assertEquals(1, providers.size());
ILanguageSettingsProvider provider = providers.get(0);
assertTrue(provider instanceof LanguageSettingsSerializable);
assertTrue(provider instanceof LanguageSettingsSerializableProvider);
List<ICLanguageSettingEntry> actual = provider.getSettingEntries(null, null, null);
assertEquals(entries.get(0), actual.get(0));
@ -513,7 +513,7 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase {
ICConfigurationDescription cfgDescription1 = cfgDescriptions[0];
assertNotNull(cfgDescription1);
assertEquals(CFG_ID, cfgDescription1.getId());
LanguageSettingsSerializable provider1 = new LanguageSettingsSerializable(PROVIDER_0, PROVIDER_NAME_0);
LanguageSettingsSerializableProvider provider1 = new LanguageSettingsSerializableProvider(PROVIDER_0, PROVIDER_NAME_0);
provider1.setStoringEntriesInProjectArea(true);
provider1.setSettingEntries(null, null, null, entries);
ArrayList<ILanguageSettingsProvider> providers = new ArrayList<ILanguageSettingsProvider>();
@ -525,7 +525,7 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase {
ICConfigurationDescription cfgDescription2 = cfgDescriptions[1];
assertNotNull(cfgDescription2);
assertEquals(CFG_ID_2, cfgDescription2.getId());
LanguageSettingsSerializable provider2 = new LanguageSettingsSerializable(PROVIDER_0, PROVIDER_NAME_0);
LanguageSettingsSerializableProvider provider2 = new LanguageSettingsSerializableProvider(PROVIDER_0, PROVIDER_NAME_0);
provider2.setStoringEntriesInProjectArea(true);
provider2.setSettingEntries(null, null, null, entries2);
ArrayList<ILanguageSettingsProvider> providers = new ArrayList<ILanguageSettingsProvider>();
@ -631,7 +631,7 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase {
ICConfigurationDescription cfgDescription = cfgDescriptions[0];
assertNotNull(cfgDescription);
LanguageSettingsSerializable serializableProvider = new MockLanguageSettingsSerializableProvider(PROVIDER_0, PROVIDER_NAME_0);
LanguageSettingsSerializableProvider serializableProvider = new MockLanguageSettingsSerializableProvider(PROVIDER_0, PROVIDER_NAME_0);
serializableProvider.setSettingEntries(null, null, null, entries);
serializableProvider.setStoringEntriesInProjectArea(true);
@ -673,7 +673,7 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase {
public void testProjectPersistence_ReferenceExtensionProviderDOM() throws Exception {
Element rootElement = null;
// provider of other type (not LanguageSettingsSerializable) defined as an extension
// provider of other type (not LanguageSettingsSerializableProvider) defined as an extension
ILanguageSettingsProvider providerExt = LanguageSettingsManager.getWorkspaceProvider(EXTENSION_PROVIDER_ID);
{
@ -797,11 +797,11 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase {
// 3. Providers defined in a configuration
// 3.1
LanguageSettingsSerializable mockProvider1 = new LanguageSettingsSerializable(PROVIDER_0, PROVIDER_NAME_0);
LanguageSettingsSerializableProvider mockProvider1 = new LanguageSettingsSerializableProvider(PROVIDER_0, PROVIDER_NAME_0);
mockProvider1.setStoringEntriesInProjectArea(true);
mockProvider1.setSettingEntries(null, null, null, entries_31);
// 3.2
LanguageSettingsSerializable mockProvider2 = new MockLanguageSettingsSerializableProvider(PROVIDER_2, PROVIDER_NAME_2);
LanguageSettingsSerializableProvider mockProvider2 = new MockLanguageSettingsSerializableProvider(PROVIDER_2, PROVIDER_NAME_2);
mockProvider2.setStoringEntriesInProjectArea(true);
mockProvider2.setSettingEntries(null, null, null, entries_32);
@ -841,7 +841,7 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase {
// 3.1
{
ILanguageSettingsProvider provider1 = providers.get(1);
assertTrue(provider1 instanceof LanguageSettingsSerializable);
assertTrue(provider1 instanceof LanguageSettingsSerializableProvider);
List<ICLanguageSettingEntry> actual = provider1.getSettingEntries(null, null, null);
assertEquals(entries_31.get(0), actual.get(0));
assertEquals(entries_31.size(), actual.size());
@ -877,7 +877,7 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase {
ICConfigurationDescription cfgDescription = cfgDescriptions[0];
// create a provider
LanguageSettingsSerializable mockProvider = new LanguageSettingsSerializable(PROVIDER_0, PROVIDER_NAME_0);
LanguageSettingsSerializableProvider mockProvider = new LanguageSettingsSerializableProvider(PROVIDER_0, PROVIDER_NAME_0);
mockProvider.setStoringEntriesInProjectArea(true);
mockProvider.setSettingEntries(cfgDescription, null, null, entries);
List<ILanguageSettingsProvider> providers = new ArrayList<ILanguageSettingsProvider>();
@ -898,7 +898,7 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase {
List<ILanguageSettingsProvider> providers = cfgDescription.getLanguageSettingProviders();
assertEquals(1, providers.size());
ILanguageSettingsProvider provider = providers.get(0);
assertTrue(provider instanceof LanguageSettingsSerializable);
assertTrue(provider instanceof LanguageSettingsSerializableProvider);
assertEquals(PROVIDER_0, provider.getId());
assertEquals(PROVIDER_NAME_0, provider.getName());
@ -975,7 +975,7 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase {
List<ILanguageSettingsProvider> providers = cfgDescription.getLanguageSettingProviders();
assertEquals(1, providers.size());
ILanguageSettingsProvider loadedProvider = providers.get(0);
assertTrue(loadedProvider instanceof LanguageSettingsSerializable);
assertTrue(loadedProvider instanceof LanguageSettingsSerializableProvider);
assertEquals(PROVIDER_0, loadedProvider.getId());
assertEquals(PROVIDER_NAME_0, loadedProvider.getName());
@ -1002,7 +1002,7 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase {
ICConfigurationDescription cfgDescription = cfgDescriptions[0];
assertNotNull(cfgDescription);
LanguageSettingsSerializable serializableProvider = new LanguageSettingsSerializable(PROVIDER_0, PROVIDER_NAME_0);
LanguageSettingsSerializableProvider serializableProvider = new LanguageSettingsSerializableProvider(PROVIDER_0, PROVIDER_NAME_0);
serializableProvider.setSettingEntries(null, null, null, entries);
// do not store entries inside project
serializableProvider.setStoringEntriesInProjectArea(false);
@ -1034,7 +1034,7 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase {
assertNotNull(providers);
assertEquals(1, providers.size());
ILanguageSettingsProvider provider = providers.get(0);
assertTrue(provider instanceof LanguageSettingsSerializable);
assertTrue(provider instanceof LanguageSettingsSerializableProvider);
List<ICLanguageSettingEntry> actual = provider.getSettingEntries(null, null, null);
assertEquals(entries.get(0), actual.get(0));
@ -1074,7 +1074,7 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase {
ICConfigurationDescription cfgDescription = cfgDescriptions[0];
// create a provider
LanguageSettingsSerializable mockProvider = new LanguageSettingsSerializable(PROVIDER_0, PROVIDER_NAME_0);
LanguageSettingsSerializableProvider mockProvider = new LanguageSettingsSerializableProvider(PROVIDER_0, PROVIDER_NAME_0);
mockProvider.setStoringEntriesInProjectArea(false);
mockProvider.setSettingEntries(cfgDescription, null, null, entries);
List<ILanguageSettingsProvider> providers = new ArrayList<ILanguageSettingsProvider>();
@ -1099,7 +1099,7 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase {
List<ILanguageSettingsProvider> providers = cfgDescription.getLanguageSettingProviders();
assertEquals(1, providers.size());
ILanguageSettingsProvider provider = providers.get(0);
assertTrue(provider instanceof LanguageSettingsSerializable);
assertTrue(provider instanceof LanguageSettingsSerializableProvider);
assertEquals(PROVIDER_0, provider.getId());
assertEquals(PROVIDER_NAME_0, provider.getName());
@ -1193,7 +1193,7 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase {
List<ILanguageSettingsProvider> providers = cfgDescription.getLanguageSettingProviders();
assertEquals(1, providers.size());
ILanguageSettingsProvider loadedProvider = providers.get(0);
assertTrue(loadedProvider instanceof LanguageSettingsSerializable);
assertTrue(loadedProvider instanceof LanguageSettingsSerializableProvider);
assertEquals(PROVIDER_0, loadedProvider.getId());
assertEquals(PROVIDER_NAME_0, loadedProvider.getName());

160
core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsSerializableTests.java
View file

@ -104,7 +104,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
languages.add(LANG_ID);
// create a provider
LanguageSettingsSerializable mockProvider = new LanguageSettingsSerializable(PROVIDER_1, PROVIDER_NAME_1);
LanguageSettingsSerializableProvider mockProvider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
// test isEmpty()
assertTrue(mockProvider.isEmpty());
@ -142,7 +142,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
Element elementProvider;
{
// create customized provider
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(PROVIDER_1, PROVIDER_NAME_1);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
provider.setStoringEntriesInProjectArea(true);
provider.setCustomParameter(CUSTOM_PARAMETER);
@ -168,7 +168,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
}
{
// re-load and check language settings of the newly loaded provider
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(elementProvider);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(elementProvider);
assertEquals(PROVIDER_1, provider.getId());
assertEquals(true, provider.isStoringEntriesInProjectArea());
assertEquals(CUSTOM_PARAMETER, provider.getCustomParameter());
@ -189,7 +189,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
Element elementProvider;
{
// create customized provider
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(PROVIDER_1, PROVIDER_NAME_1);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
provider.setStoringEntriesInProjectArea(true);
provider.setCustomParameter(CUSTOM_PARAMETER);
@ -216,7 +216,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
}
{
// re-load and check language settings of the newly loaded provider
LanguageSettingsSerializable provider = new LanguageSettingsSerializable();
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider();
provider.loadAttributes(elementProvider);
assertEquals(PROVIDER_1, provider.getId());
assertEquals(true, provider.isStoringEntriesInProjectArea());
@ -236,7 +236,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
Element rootElement;
{
// create customized provider
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(PROVIDER_1, PROVIDER_NAME_1);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
provider.setStoringEntriesInProjectArea(true);
provider.setCustomParameter(CUSTOM_PARAMETER);
@ -264,7 +264,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
}
{
// re-load and check language settings of the newly loaded provider
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(PROVIDER_2, PROVIDER_NAME_2);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_2, PROVIDER_NAME_2);
provider.loadEntries(rootElement);
assertEquals(PROVIDER_2, provider.getId());
assertEquals(PROVIDER_NAME_2, provider.getName());
@ -288,7 +288,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
Element elementProvider;
{
// create null provider
LanguageSettingsSerializable providerNull = new LanguageSettingsSerializable(PROVIDER_NULL, PROVIDER_NAME_NULL);
LanguageSettingsSerializableProvider providerNull = new LanguageSettingsSerializableProvider(PROVIDER_NULL, PROVIDER_NAME_NULL);
assertNull(providerNull.getSettingEntries(null, null, null));
// set and get null entries
providerNull.setSettingEntries(null, null, null, null);
@ -302,7 +302,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
}
{
// re-load and check language settings of the newly loaded provider
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(elementProvider);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(elementProvider);
assertEquals(PROVIDER_NULL, provider.getId());
List<ICLanguageSettingEntry> actual = provider.getSettingEntries(null, null, null);
assertNull(actual);
@ -315,7 +315,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
Element elementProvider;
{
// create provider with custom parameter
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(PROVIDER_1, PROVIDER_NAME_1);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
provider.setCustomParameter(CUSTOM_PARAMETER);
assertEquals(CUSTOM_PARAMETER, provider.getCustomParameter());
@ -327,7 +327,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
}
{
// re-load and check custom parameter of the newly loaded provider
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(elementProvider);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(elementProvider);
assertEquals(CUSTOM_PARAMETER, provider.getCustomParameter());
}
}
@ -338,7 +338,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
Element elementProvider;
{
// create provider with custom parameter
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(PROVIDER_1, PROVIDER_NAME_1);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
assertEquals(false, provider.isStoringEntriesInProjectArea());
provider.setStoringEntriesInProjectArea(true);
assertEquals(true, provider.isStoringEntriesInProjectArea());
@ -352,7 +352,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
}
{
// re-load and check custom parameter of the newly loaded provider
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(elementProvider);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(elementProvider);
assertEquals(true, provider.isStoringEntriesInProjectArea());
}
}
@ -367,7 +367,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
Element elementProvider;
{
// create provider with custom language scope
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(PROVIDER_1, PROVIDER_NAME_1);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
provider.setLanguageScope(expectedLanguageIds);
List<String> actualIds = provider.getLanguageScope();
assertEquals(LANG_ID, actualIds.get(0));
@ -383,7 +383,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
}
{
// re-load and check language settings of the newly loaded provider
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(elementProvider);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(elementProvider);
List<String> actualIds = provider.getLanguageScope();
assertEquals(expectedLanguageIds.get(0), actualIds.get(0));
assertEquals(expectedLanguageIds.get(1), actualIds.get(1));
@ -406,7 +406,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
Element elementProvider;
{
// create provider with no scope by default
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(PROVIDER_1, PROVIDER_NAME_1);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
// set entries for the whole language scope (now langId=null)
provider.setSettingEntries(null, null, null, entries);
{
@ -452,7 +452,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
}
{
// re-load and check language settings of the newly loaded provider
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(elementProvider);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(elementProvider);
List<String> actualIds = provider.getLanguageScope();
assertEquals(expectedLanguageIds.get(0), actualIds.get(0));
assertEquals(expectedLanguageIds.get(1), actualIds.get(1));
@ -485,7 +485,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
entries.add(new CIncludePathEntry("path0", 0));
{
// create a provider and serialize its settings
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(PROVIDER_1, PROVIDER_NAME_1);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
provider.setSettingEntries(null, MOCK_RC, LANG_ID, entries);
Document doc = XmlUtil.newDocument();
@ -494,11 +494,11 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
// verify that "configuration" element is collapsed and not saved in XML
String xmlString = XmlUtil.toString(doc);
assertFalse(xmlString.contains("<configuration")); // LanguageSettingsSerializable.ELEM_CONFIGURATION;
assertFalse(xmlString.contains("<configuration")); // LanguageSettingsSerializableProvider.ELEM_CONFIGURATION;
}
{
// re-load and check language settings of the newly loaded provider
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(elementProvider);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(elementProvider);
assertEquals(PROVIDER_1, provider.getId());
List<ICLanguageSettingEntry> actual = provider.getSettingEntries(null, MOCK_RC, LANG_ID);
assertEquals(entries.get(0), actual.get(0));
@ -514,7 +514,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
entries.add(new CIncludePathEntry("path0", 0));
{
// create a provider and serialize its settings
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(PROVIDER_1, PROVIDER_NAME_1);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
provider.setSettingEntries(MOCK_CFG, MOCK_RC, null, entries);
Document doc = XmlUtil.newDocument();
@ -523,11 +523,11 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
// verify that "language" element is collapsed and not saved in XML
String xmlString = XmlUtil.toString(doc);
assertFalse(xmlString.contains("<language")); // LanguageSettingsSerializable.ELEM_LANGUAGE;
assertFalse(xmlString.contains("<language")); // LanguageSettingsStorage.ELEM_LANGUAGE;
}
{
// re-load and check language settings of the newly loaded provider
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(elementProvider);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(elementProvider);
assertEquals(PROVIDER_1, provider.getId());
List<ICLanguageSettingEntry> actual = provider.getSettingEntries(MOCK_CFG, MOCK_RC, null);
assertEquals(entries.get(0), actual.get(0));
@ -548,7 +548,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
{
// create a provider
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(PROVIDER_1, PROVIDER_NAME_1);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
assertEquals(null, provider.getLanguageScope());
// add null language
@ -590,11 +590,11 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
// verify that "language" element is saved in XML
String xmlString = XmlUtil.toString(doc);
assertTrue(xmlString.contains("<language")); // LanguageSettingsSerializable.ELEM_LANGUAGE;
assertTrue(xmlString.contains("<language")); // LanguageSettingsStorage.ELEM_LANGUAGE;
}
{
// re-load and check language settings of the newly loaded provider
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(elementProvider);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(elementProvider);
{
// getter by null language
List<ICLanguageSettingEntry> actual = provider.getSettingEntries(null, MOCK_RC, null);
@ -619,7 +619,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
entries.add(new CIncludePathEntry("path0", 0));
{
// create a provider and serialize its settings
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(PROVIDER_1, PROVIDER_NAME_1);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
provider.setSettingEntries(MOCK_CFG, null, LANG_ID, entries);
Document doc = XmlUtil.newDocument();
@ -628,11 +628,11 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
// verify that "resource" element is collapsed and not saved in XML
String xmlString = XmlUtil.toString(doc);
assertFalse(xmlString.contains("<resource")); // LanguageSettingsSerializable.ELEM_RESOURCE;
assertFalse(xmlString.contains("<resource")); // LanguageSettingsStorage.ELEM_RESOURCE;
}
{
// re-load and check language settings of the newly loaded provider
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(elementProvider);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(elementProvider);
assertEquals(PROVIDER_1, provider.getId());
List<ICLanguageSettingEntry> actual = provider.getSettingEntries(MOCK_CFG, null, LANG_ID);
assertEquals(entries.get(0), actual.get(0));
@ -648,7 +648,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
entries.add(new CIncludePathEntry("path0", 0));
{
// create a provider and serialize its settings
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(PROVIDER_1, PROVIDER_NAME_1);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
provider.setSettingEntries(null, MOCK_RC, null, entries);
Document doc = XmlUtil.newDocument();
@ -657,12 +657,12 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
// verify that element is collapsed and not saved in XML
String xmlString = XmlUtil.toString(doc);
assertFalse(xmlString.contains("<configuration")); // LanguageSettingsSerializable.ELEM_CONFIGURATION;
assertFalse(xmlString.contains("<language")); // LanguageSettingsSerializable.ELEM_LANGUAGE;
assertFalse(xmlString.contains("<configuration")); // LanguageSettingsSerializableProvider.ELEM_CONFIGURATION;
assertFalse(xmlString.contains("<language")); // LanguageSettingsStorage.ELEM_LANGUAGE;
}
{
// re-load and check language settings of the newly loaded provider
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(elementProvider);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(elementProvider);
assertEquals(PROVIDER_1, provider.getId());
List<ICLanguageSettingEntry> actual = provider.getSettingEntries(null, MOCK_RC, null);
assertEquals(entries.get(0), actual.get(0));
@ -678,7 +678,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
entries.add(new CIncludePathEntry("path0", 0));
{
// create a provider and serialize its settings
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(PROVIDER_1, PROVIDER_NAME_1);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
provider.setSettingEntries(null, null, LANG_ID, entries);
Document doc = XmlUtil.newDocument();
@ -687,12 +687,12 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
// verify that element is collapsed and not saved in XML
String xmlString = XmlUtil.toString(doc);
assertFalse(xmlString.contains("<configuration")); // LanguageSettingsSerializable.ELEM_CONFIGURATION;
assertFalse(xmlString.contains("<resource")); // LanguageSettingsSerializable.ELEM_RESOURCE;
assertFalse(xmlString.contains("<configuration")); // LanguageSettingsSerializableProvider.ELEM_CONFIGURATION;
assertFalse(xmlString.contains("<resource")); // LanguageSettingsStorage.ELEM_RESOURCE;
}
{
// re-load and check language settings of the newly loaded provider
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(elementProvider);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(elementProvider);
assertEquals(PROVIDER_1, provider.getId());
List<ICLanguageSettingEntry> actual = provider.getSettingEntries(null, null, LANG_ID);
assertEquals(entries.get(0), actual.get(0));
@ -708,7 +708,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
entries.add(new CIncludePathEntry("path0", 0));
{
// create a provider and serialize its settings
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(PROVIDER_1, PROVIDER_NAME_1);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
provider.setSettingEntries(MOCK_CFG, null, null, entries);
Document doc = XmlUtil.newDocument();
@ -717,12 +717,12 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
// verify that element is collapsed and not saved in XML
String xmlString = XmlUtil.toString(doc);
assertFalse(xmlString.contains("<language")); // LanguageSettingsSerializable.ELEM_LANGUAGE;
assertFalse(xmlString.contains("<resource")); // LanguageSettingsSerializable.ELEM_RESOURCE;
assertFalse(xmlString.contains("<language")); // LanguageSettingsStorage.ELEM_LANGUAGE;
assertFalse(xmlString.contains("<resource")); // LanguageSettingsStorage.ELEM_RESOURCE;
}
{
// re-load and check language settings of the newly loaded provider
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(elementProvider);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(elementProvider);
assertEquals(PROVIDER_1, provider.getId());
List<ICLanguageSettingEntry> actual = provider.getSettingEntries(MOCK_CFG, null, null);
assertEquals(entries.get(0), actual.get(0));
@ -739,7 +739,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
entries.add(new CIncludePathEntry("path0", flag));
{
// create a provider and serialize its settings
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(PROVIDER_1, PROVIDER_NAME_1);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
provider.setSettingEntries(null, null, null, entries);
Document doc = XmlUtil.newDocument();
@ -748,14 +748,14 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
// verify that element is collapsed and not saved in XML
String xmlString = XmlUtil.toString(doc);
assertFalse(xmlString.contains("<configuration")); // LanguageSettingsSerializable.ELEM_CONFIGURATION;
assertFalse(xmlString.contains("<language")); // LanguageSettingsSerializable.ELEM_LANGUAGE;
assertFalse(xmlString.contains("<resource")); // LanguageSettingsSerializable.ELEM_RESOURCE;
assertFalse(xmlString.contains("<flag")); // LanguageSettingsSerializable.ELEM_FLAG;
assertFalse(xmlString.contains("<configuration")); // LanguageSettingsSerializableProvider.ELEM_CONFIGURATION;
assertFalse(xmlString.contains("<language")); // LanguageSettingsStorage.ELEM_LANGUAGE;
assertFalse(xmlString.contains("<resource")); // LanguageSettingsStorage.ELEM_RESOURCE;
assertFalse(xmlString.contains("<flag")); // LanguageSettingsStorage.ELEM_FLAG;
}
{
// re-load and check language settings of the newly loaded provider
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(elementProvider);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(elementProvider);
assertEquals(PROVIDER_1, provider.getId());
List<ICLanguageSettingEntry> actual = provider.getSettingEntries(null, null, null);
assertEquals(entries.get(0), actual.get(0));
@ -770,7 +770,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
entries.add(new CIncludePathEntry("path0", 1));
{
// create a provider and serialize its settings
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(PROVIDER_1, PROVIDER_NAME_1);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
provider.setSettingEntries(null, null, null, entries);
Document doc = XmlUtil.newDocument();
@ -779,7 +779,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
}
{
// re-load and check language settings of the newly loaded provider
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(elementProvider);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(elementProvider);
assertEquals(PROVIDER_1, provider.getId());
List<ICLanguageSettingEntry> actual = provider.getSettingEntries(null, null, null);
@ -803,7 +803,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
entries.add(new CIncludeFileEntry("name", 1));
{
// create a provider and serialize its settings
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(PROVIDER_1, PROVIDER_NAME_1);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
provider.setSettingEntries(null, null, null, entries);
Document doc = XmlUtil.newDocument();
@ -812,7 +812,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
}
{
// re-load and check language settings of the newly loaded provider
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(elementProvider);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(elementProvider);
assertEquals(PROVIDER_1, provider.getId());
List<ICLanguageSettingEntry> actual = provider.getSettingEntries(null, null, null);
@ -835,7 +835,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
entries.add(new CMacroEntry("MACRO0", "value0",1));
{
// create a provider and serialize its settings
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(PROVIDER_1, PROVIDER_NAME_1);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
provider.setSettingEntries(null, null, null, entries);
Document doc = XmlUtil.newDocument();
@ -844,7 +844,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
}
{
// re-load and check language settings of the newly loaded provider
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(elementProvider);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(elementProvider);
assertEquals(PROVIDER_1, provider.getId());
List<ICLanguageSettingEntry> actual = provider.getSettingEntries(null, null, null);
@ -867,7 +867,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
entries.add(new CMacroFileEntry("name", 1));
{
// create a provider and serialize its settings
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(PROVIDER_1, PROVIDER_NAME_1);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
provider.setSettingEntries(null, null, null, entries);
Document doc = XmlUtil.newDocument();
@ -876,7 +876,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
}
{
// re-load and check language settings of the newly loaded provider
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(elementProvider);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(elementProvider);
assertEquals(PROVIDER_1, provider.getId());
List<ICLanguageSettingEntry> actual = provider.getSettingEntries(null, null, null);
@ -899,7 +899,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
entries.add(new CLibraryPathEntry("name", 1));
{
// create a provider and serialize its settings
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(PROVIDER_1, PROVIDER_NAME_1);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
provider.setSettingEntries(null, null, null, entries);
Document doc = XmlUtil.newDocument();
@ -908,7 +908,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
}
{
// re-load and check language settings of the newly loaded provider
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(elementProvider);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(elementProvider);
assertEquals(PROVIDER_1, provider.getId());
List<ICLanguageSettingEntry> actual = provider.getSettingEntries(null, null, null);
@ -931,7 +931,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
entries.add(new CLibraryFileEntry("name", 1));
{
// create a provider and serialize its settings
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(PROVIDER_1, PROVIDER_NAME_1);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
provider.setSettingEntries(null, null, null, entries);
Document doc = XmlUtil.newDocument();
@ -940,7 +940,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
}
{
// re-load and check language settings of the newly loaded provider
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(elementProvider);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(elementProvider);
assertEquals(PROVIDER_1, provider.getId());
List<ICLanguageSettingEntry> actual = provider.getSettingEntries(null, null, null);
@ -965,7 +965,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
entries.add(new CMacroEntry("MACRO0", "value0",1));
{
// create a provider and serialize its settings
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(PROVIDER_1, PROVIDER_NAME_1);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
provider.setSettingEntries(null, null, null, entries);
Document doc = XmlUtil.newDocument();
@ -974,7 +974,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
}
{
// re-load and check language settings of the newly loaded provider
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(elementProvider);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(elementProvider);
assertEquals(PROVIDER_1, provider.getId());
List<ICLanguageSettingEntry> actual = provider.getSettingEntries(null, null, null);
@ -997,8 +997,8 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
{
// create a provider
LanguageSettingsSerializable mockProvider = null;
mockProvider = new LanguageSettingsSerializable(PROVIDER_1, PROVIDER_NAME_1);
LanguageSettingsSerializableProvider mockProvider = null;
mockProvider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
mockProvider.setSettingEntries(null, null, null, entries);
mockProvider.setSettingEntries(null, null, LANG_ID, entries2);
@ -1009,7 +1009,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
}
{
// re-load and check language settings of the newly loaded provider
LanguageSettingsSerializable loadedProvider = new LanguageSettingsSerializable(elementProvider);
LanguageSettingsSerializableProvider loadedProvider = new LanguageSettingsSerializableProvider(elementProvider);
List<ICLanguageSettingEntry> actual = loadedProvider.getSettingEntries(null, null, null);
assertEquals(entries.get(0), actual.get(0));
@ -1033,8 +1033,8 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
{
// create a provider
LanguageSettingsSerializable mockProvider = null;
mockProvider = new LanguageSettingsSerializable(PROVIDER_1, PROVIDER_NAME_1);
LanguageSettingsSerializableProvider mockProvider = null;
mockProvider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
mockProvider.setSettingEntries(null, null, LANG_ID_1, entries);
mockProvider.setSettingEntries(null, null, LANG_ID_2, entries2);
@ -1047,7 +1047,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
}
{
// re-load and check language settings of the newly loaded provider
LanguageSettingsSerializable loadedProvider = new LanguageSettingsSerializable(elementProvider);
LanguageSettingsSerializableProvider loadedProvider = new LanguageSettingsSerializableProvider(elementProvider);
List<ICLanguageSettingEntry> actual = loadedProvider.getSettingEntries(null, null, LANG_ID_1);
assertEquals(entries.get(0), actual.get(0));
@ -1079,8 +1079,8 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
{
// create a provider
LanguageSettingsSerializable mockProvider = null;
mockProvider = new LanguageSettingsSerializable(PROVIDER_1, PROVIDER_NAME_1);
LanguageSettingsSerializableProvider mockProvider = null;
mockProvider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
mockProvider.setSettingEntries(null, rc1, null, entries);
mockProvider.setSettingEntries(null, rc2, null, entries2);
@ -1093,7 +1093,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
}
{
// re-load and check language settings of the newly loaded provider
LanguageSettingsSerializable loadedProvider = new LanguageSettingsSerializable(elementProvider);
LanguageSettingsSerializableProvider loadedProvider = new LanguageSettingsSerializableProvider(elementProvider);
List<ICLanguageSettingEntry> actual = loadedProvider.getSettingEntries(null, rc1, null);
assertEquals(entries.get(0), actual.get(0));
@ -1118,7 +1118,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
assertNotNull(emptySettingsPath);
// Create provider
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(PROVIDER_1, PROVIDER_NAME_1);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
// store the entries in parent folder
List<ICLanguageSettingEntry> entries = new ArrayList<ICLanguageSettingEntry>();
@ -1171,7 +1171,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
sampleLanguages.add(LANG_ID);
// create a model provider
LanguageSettingsSerializable provider1 = new LanguageSettingsSerializable(PROVIDER_1, PROVIDER_NAME_1);
LanguageSettingsSerializableProvider provider1 = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
provider1.setLanguageScope(sampleLanguages);
provider1.setCustomParameter(CUSTOM_PARAMETER);
assertEquals(false, provider1.isStoringEntriesInProjectArea());
@ -1181,7 +1181,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
{
// create another provider with the same data
LanguageSettingsSerializable provider2 = new LanguageSettingsSerializable(PROVIDER_1, PROVIDER_NAME_1);
LanguageSettingsSerializableProvider provider2 = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
assertFalse(provider1.equals(provider2));
assertFalse(provider1.hashCode()==provider2.hashCode());
@ -1215,8 +1215,8 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
{
// check that subclasses are not equal
LanguageSettingsSerializable providerSub1 = new LanguageSettingsSerializable() {};
LanguageSettingsSerializable providerSub2 = new LanguageSettingsSerializable() {};
LanguageSettingsSerializableProvider providerSub1 = new LanguageSettingsSerializableProvider() {};
LanguageSettingsSerializableProvider providerSub2 = new LanguageSettingsSerializableProvider() {};
assertFalse(providerSub1.equals(providerSub2));
assertFalse(providerSub1.hashCode()==providerSub2.hashCode());
}
@ -1238,7 +1238,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
sampleLanguages.add(LANG_ID);
// create a model provider
class LanguageSettingsSerializableMock extends LanguageSettingsSerializable implements Cloneable {
class LanguageSettingsSerializableMock extends LanguageSettingsSerializableProvider implements Cloneable {
public LanguageSettingsSerializableMock(String id, String name) {
super(id, name);
}
@ -1286,7 +1286,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
sampleLanguages.add(LANG_ID);
// create a model provider
class LanguageSettingsSerializableMock extends LanguageSettingsSerializable implements Cloneable {
class LanguageSettingsSerializableMock extends LanguageSettingsSerializableProvider implements Cloneable {
public LanguageSettingsSerializableMock(String id, String name) {
super(id, name);
}
@ -1352,7 +1352,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
unsortedEntries.add(libraryPathEntry2);
// create a provider and set the entries
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(PROVIDER_1, PROVIDER_NAME_1);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
provider.setSettingEntries(null, null, null, unsortedEntries);
// retrieve and check that language settings got sorted properly
@ -1409,7 +1409,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
unsortedEntries.add(libraryPathEntry2);
// create a provider and set the entries
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(PROVIDER_1, PROVIDER_NAME_1);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
provider.setSettingEntries(null, null, null, unsortedEntries);
// retrieve and check that language settings got sorted properly
@ -1451,7 +1451,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
unsortedEntries.add(macroEntry2C);
// create a provider and set the entries
LanguageSettingsSerializable provider = new LanguageSettingsSerializable(PROVIDER_1, PROVIDER_NAME_1);
LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
provider.setSettingEntries(null, null, null, unsortedEntries);
// retrieve and check that language settings got sorted properly

4
core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/MockLanguageSettingsEditableProvider.java
View file

@ -11,10 +11,10 @@
package org.eclipse.cdt.core.language.settings.providers;
import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsSerializable;
import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsSerializableProvider;
public class MockLanguageSettingsEditableProvider extends LanguageSettingsSerializable implements ILanguageSettingsEditableProvider {
public class MockLanguageSettingsEditableProvider extends LanguageSettingsSerializableProvider implements ILanguageSettingsEditableProvider {
public MockLanguageSettingsEditableProvider() {
super();
}

4
core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/MockLanguageSettingsSerializableProvider.java
View file

@ -11,10 +11,10 @@
package org.eclipse.cdt.core.language.settings.providers;
import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsSerializable;
import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsSerializableProvider;
public class MockLanguageSettingsSerializableProvider extends LanguageSettingsSerializable {
public class MockLanguageSettingsSerializableProvider extends LanguageSettingsSerializableProvider {
public MockLanguageSettingsSerializableProvider() {
super();
}

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

@ -20,7 +20,7 @@ import org.eclipse.core.runtime.Assert;
/**
* Language Settings Provider that keeps count how many times it has been registered.
*/
public class MockListenerRegisterer extends LanguageSettingsSerializable implements ILanguageSettingsEditableProvider, ICListenerAgent {
public class MockListenerRegisterer extends LanguageSettingsSerializableProvider implements ILanguageSettingsEditableProvider, ICListenerAgent {
private static MockListenerManager mockListenerManager = new MockListenerManager();
private static class MockListenerManager {

4
core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionDeltaTests.java
View file

@ -20,7 +20,7 @@ import junit.framework.TestSuite;
import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsProvider;
import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsSerializable;
import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsSerializableProvider;
import org.eclipse.cdt.core.model.CoreModel;
import org.eclipse.cdt.core.settings.model.util.CDataUtil;
import org.eclipse.cdt.core.testplugin.ResourceHelper;
@ -1012,7 +1012,7 @@ public class CProjectDescriptionDeltaTests extends BaseTestCase{
List<ILanguageSettingsProvider> originalProviders = cfgDescription.getLanguageSettingProviders();
// Modification LANGUAGE_SETTINGS_PROVIDERS
ILanguageSettingsProvider provider = new LanguageSettingsSerializable("id", "name");
ILanguageSettingsProvider provider = new LanguageSettingsSerializableProvider("id", "name");
List<ILanguageSettingsProvider> providers = new ArrayList<ILanguageSettingsProvider>();
providers.add(provider);
cfgDescription.setLanguageSettingProviders(providers);

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

@ -19,7 +19,7 @@ import org.eclipse.core.resources.IResource;
/**
* This interface is used in UI to identify classes allowing user to modify settings externally
* contrary to some subclasses of {@link LanguageSettingsSerializable} managing
* contrary to some subclasses of {@link LanguageSettingsSerializableProvider} managing
* their settings themselves and not providing such option to the user.
*
*/

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

@ -28,7 +28,7 @@ import org.eclipse.core.resources.IResource;
* To define a provider like that use extension point
* {@code org.eclipse.cdt.core.LanguageSettingsProvider} and implement this
* interface. CDT provides a few general use implementations such as
* {@link LanguageSettingsBaseProvider} or {@link LanguageSettingsSerializable}
* {@link LanguageSettingsBaseProvider} or {@link LanguageSettingsSerializableProvider}
* which could be used out of the box or extended. See also extension point
* schema description LanguageSettingsProvider.exsd.
*

31
core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsManager.java
View file

@ -59,22 +59,23 @@ public class LanguageSettingsManager {
/**
* Builds for the provider a nice looking resource tree to present hierarchical view to the user.
*
*
* TODO - Note that after using this method for a while for BOP parsers it appears that disadvantages
* outweight benefits. In particular, it doesn't result in saving memory as the language settings
* (and the lists itself) are not duplicated in memory anyway but optimized with using WeakHashSet
* and SafeStringInterner.
*
*
* @param provider - language settings provider to build the tree for.
* @param cfgDescription - configuration description.
* @param languageId - language ID.
* @param project - the project which is considered the root of the resource tree.
*/
public static void buildResourceTree(LanguageSettingsSerializable provider, ICConfigurationDescription cfgDescription, String languageId, IProject project) {
public static void buildResourceTree(LanguageSettingsSerializableProvider provider,
ICConfigurationDescription cfgDescription, String languageId, IProject project) {
LanguageSettingsProvidersSerializer.buildResourceTree(provider, cfgDescription, languageId, project);
}
/**
* Returns the list of setting entries of a certain kind (such as include paths)
* for the given configuration description, resource and language. This is a
@ -91,7 +92,7 @@ public class LanguageSettingsManager {
*
* @return the list of setting entries.
*/
// FIXME: get rid of callers PathEntryTranslator and DescriptionScannerInfoProvider
// FIXME: get rid of callers PathEntryTranslator and DescriptionScannerInfoProvider
public static List<ICLanguageSettingEntry> getSettingEntriesByKind(ICConfigurationDescription cfgDescription, IResource rc, String languageId, int kind) {
return LanguageSettingsProvidersSerializer.getSettingEntriesByKind(cfgDescription, rc, languageId, kind);
}
@ -132,7 +133,7 @@ public class LanguageSettingsManager {
/**
* TODO - helper method for often used chunk of code
* @param provider
* @param provider
* @return ILanguageSettingsProvider
*/
public static ILanguageSettingsProvider getRawProvider(ILanguageSettingsProvider provider) {
@ -141,8 +142,8 @@ public class LanguageSettingsManager {
}
return provider;
}
/**
* Set and store in workspace area user defined providers.
*
@ -174,7 +175,7 @@ public class LanguageSettingsManager {
}
if (provider==null)
provider = LanguageSettingsManager.getWorkspaceProvider(id);
return provider;
}
@ -182,11 +183,11 @@ public class LanguageSettingsManager {
* Find language IDs for the resource represented by resource description.
* Under the hood build component is inquired and the language IDs would
* commonly come from the input type(s).
*
*
* @param rcDescription - resource description
* @return list of language IDs for the resource.
* Never returns {@code null} but empty list if no languages can be found.
*
*
*/
public static List<String> getLanguages(ICResourceDescription rcDescription) {
ICLanguageSetting[] languageSettings = null;
@ -198,7 +199,7 @@ public class LanguageSettingsManager {
} else if (rcDescription instanceof ICFolderDescription) {
languageSettings = ((ICFolderDescription)rcDescription).getLanguageSettings();
}
List<String> languageIds = new ArrayList<String>();
if (languageSettings != null) {
for (ICLanguageSetting languageSetting : languageSettings) {
@ -210,7 +211,7 @@ public class LanguageSettingsManager {
}
}
}
return languageIds;
}
@ -218,7 +219,7 @@ public class LanguageSettingsManager {
* Find language IDs for the resource in given build configuration.
* Under the hood build component is inquired and the language IDs would
* commonly come from the input type(s).
*
*
* @param resource - the resource to find languages for.
* @param cfgDescription
* @return list of language IDs for the resource.
@ -252,7 +253,7 @@ public class LanguageSettingsManager {
}
languageIds = getLanguages(rcDes);
}
return languageIds;
}

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

@ -36,7 +36,7 @@ public class LanguageSettingsManager_TBD {
for (ILanguageSettingsProvider provider: cfgDescription.getLanguageSettingProviders()) {
// FIXME
// if (!LanguageSettingsManager.isWorkspaceProvider(provider)) {
if (provider instanceof ILanguageSettingsEditableProvider || provider instanceof LanguageSettingsSerializable) {
if (provider instanceof ILanguageSettingsEditableProvider || provider instanceof LanguageSettingsSerializableProvider) {
for (String languageId : LanguageSettingsManager.getLanguages(rc, cfgDescription)) {
List<ICLanguageSettingEntry> list = provider.getSettingEntries(cfgDescription, rc, languageId);
if (list!=null) {

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

@ -14,7 +14,7 @@ package org.eclipse.cdt.core.language.settings.providers;
// TODO: move ILanguageSettingsEditableProvider here
// TODO this one is unused - remove
final public class LanguageSettingsSerializableEditable extends LanguageSettingsSerializable implements ILanguageSettingsEditableProvider {
final public class LanguageSettingsSerializableEditable extends LanguageSettingsSerializableProvider implements ILanguageSettingsEditableProvider {
@Override
public LanguageSettingsSerializableEditable clone() throws CloneNotSupportedException {
return (LanguageSettingsSerializableEditable) super.clone();

20
core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsSerializable.java → core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsSerializableProvider.java
View file

@ -31,7 +31,7 @@ import org.w3c.dom.NodeList;
* TODO - more JavaDoc, info and hints about class hierarchy
*
*/
public class LanguageSettingsSerializable extends LanguageSettingsBaseProvider {
public class LanguageSettingsSerializableProvider extends LanguageSettingsBaseProvider {
public static final String ELEM_PROVIDER = "provider"; //$NON-NLS-1$
private static final String ATTR_ID = "id"; //$NON-NLS-1$
@ -51,7 +51,7 @@ public class LanguageSettingsSerializable extends LanguageSettingsBaseProvider {
/**
* Default constructor. This constructor has to be always followed with setting id and name of the provider.
*/
public LanguageSettingsSerializable() {
public LanguageSettingsSerializableProvider() {
super();
}
@ -61,7 +61,7 @@ public class LanguageSettingsSerializable extends LanguageSettingsBaseProvider {
* @param id - id of the provider.
* @param name - name of the provider. Note that this name may show up in UI.
*/
public LanguageSettingsSerializable(String id, String name) {
public LanguageSettingsSerializableProvider(String id, String name) {
super(id, name);
}
@ -70,7 +70,7 @@ public class LanguageSettingsSerializable extends LanguageSettingsBaseProvider {
*
* @param elementProvider
*/
public LanguageSettingsSerializable(Element elementProvider) {
public LanguageSettingsSerializableProvider(Element elementProvider) {
super();
load(elementProvider);
}
@ -315,8 +315,8 @@ public class LanguageSettingsSerializable extends LanguageSettingsBaseProvider {
* See {@link #cloneShallow()}. This method is extracted
* to avoid expressing {@link #clone()} via {@link #cloneShallow()}.
*/
private LanguageSettingsSerializable cloneShallowInternal() throws CloneNotSupportedException {
LanguageSettingsSerializable clone = (LanguageSettingsSerializable)super.clone();
private LanguageSettingsSerializableProvider cloneShallowInternal() throws CloneNotSupportedException {
LanguageSettingsSerializableProvider clone = (LanguageSettingsSerializableProvider)super.clone();
if (languageScope!=null)
clone.languageScope = new ArrayList<String>(languageScope);
@ -331,13 +331,13 @@ public class LanguageSettingsSerializable extends LanguageSettingsBaseProvider {
* @return shallow copy of the provider.
* @throws CloneNotSupportedException in case {@link #clone()} throws the exception.
*/
protected LanguageSettingsSerializable cloneShallow() throws CloneNotSupportedException {
protected LanguageSettingsSerializableProvider cloneShallow() throws CloneNotSupportedException {
return cloneShallowInternal();
}
@Override
protected LanguageSettingsSerializable clone() throws CloneNotSupportedException {
LanguageSettingsSerializable clone = cloneShallowInternal();
protected LanguageSettingsSerializableProvider clone() throws CloneNotSupportedException {
LanguageSettingsSerializableProvider clone = cloneShallowInternal();
clone.fStorage = fStorage.cloneStorage();
return clone;
}
@ -368,7 +368,7 @@ public class LanguageSettingsSerializable extends LanguageSettingsBaseProvider {
return false;
if (getClass() != obj.getClass())
return false;
LanguageSettingsSerializable other = (LanguageSettingsSerializable) obj;
LanguageSettingsSerializableProvider other = (LanguageSettingsSerializableProvider) obj;
String id = getId();
String otherId = other.getId();

6
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/settings/providers/LanguageSettingsExtensionManager.java
View file

@ -23,7 +23,7 @@ import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsEditableProvider;
import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsProvider;
import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsBaseProvider;
import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsSerializable;
import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsSerializableProvider;
import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry;
import org.eclipse.cdt.core.settings.model.util.CDataUtil;
import org.eclipse.cdt.core.settings.model.util.LanguageSettingEntriesSerializer;
@ -255,8 +255,8 @@ public class LanguageSettingsExtensionManager {
* @return new instance of language settings provider.
*/
/*package*/ static ILanguageSettingsProvider getProviderInstance(String className) {
if (className==null || className.equals(LanguageSettingsSerializable.class.getName())) {
return new LanguageSettingsSerializable();
if (className==null || className.equals(LanguageSettingsSerializableProvider.class.getName())) {
return new LanguageSettingsSerializableProvider();
}
ILanguageSettingsProvider provider = createProviderCarcass(className, Platform.getExtensionRegistry());

33
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/settings/providers/LanguageSettingsProvidersSerializer.java
View file

@ -23,7 +23,7 @@ import org.eclipse.cdt.core.language.settings.providers.ICListenerAgent;
import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsEditableProvider;
import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsProvider;
import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsManager;
import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsSerializable;
import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsSerializableProvider;
import org.eclipse.cdt.core.language.settings.providers.ScannerDiscoveryLegacySupport;
import org.eclipse.cdt.core.model.ILanguage;
import org.eclipse.cdt.core.model.LanguageManager;
@ -337,11 +337,11 @@ public class LanguageSettingsProvidersSerializer {
rawGlobalWorkspaceProviders = rawWorkspaceProviders;
}
private static List<LanguageSettingsChangeEvent> createLanguageLettingsChangeEvents(List<LanguageSettingsSerializable> serializableProviders) {
private static List<LanguageSettingsChangeEvent> createLanguageLettingsChangeEvents(List<LanguageSettingsSerializableProvider> serializableProviders) {
List<LanguageSettingsChangeEvent> events = new ArrayList<LanguageSettingsProvidersSerializer.LanguageSettingsChangeEvent>();
List<String> serializableIds = new ArrayList<String>();
for (LanguageSettingsSerializable provider : serializableProviders) {
for (LanguageSettingsSerializableProvider provider : serializableProviders) {
serializableIds.add(provider.getId());
}
@ -376,13 +376,13 @@ projects:
LanguageSettingsLogger.logWarning("LanguageSettingsProvidersSerializer.serializeLanguageSettingsWorkspace()");
URI uriStoreWsp = getStoreInWorkspaceArea(STORAGE_WORKSPACE_LANGUAGE_SETTINGS);
List<LanguageSettingsSerializable> serializableWorkspaceProviders = new ArrayList<LanguageSettingsSerializable>();
List<LanguageSettingsSerializableProvider> serializableWorkspaceProviders = new ArrayList<LanguageSettingsSerializableProvider>();
for (ILanguageSettingsProvider provider : rawGlobalWorkspaceProviders.values()) {
if (provider instanceof LanguageSettingsSerializable) {
if (provider instanceof LanguageSettingsSerializableProvider) {
// serialize all editable providers which are different from corresponding extension
// and serialize all serializable ones that are not editable (those are singletons and we don't know whether they changed)
if (!(provider instanceof ILanguageSettingsEditableProvider) || !LanguageSettingsExtensionManager.equalsExtensionProvider(provider)) {
serializableWorkspaceProviders.add((LanguageSettingsSerializable)provider);
serializableWorkspaceProviders.add((LanguageSettingsSerializableProvider)provider);
}
}
}
@ -403,7 +403,7 @@ projects:
Element rootElement = XmlUtil.appendElement(doc, ELEM_PLUGIN);
Element elementExtension = XmlUtil.appendElement(rootElement, ELEM_EXTENSION, new String[] {ATTR_POINT, LanguageSettingsExtensionManager.PROVIDER_EXTENSION_FULL_ID});
for (LanguageSettingsSerializable provider : serializableWorkspaceProviders) {
for (LanguageSettingsSerializableProvider provider : serializableWorkspaceProviders) {
provider.serialize(elementExtension);
}
@ -445,7 +445,7 @@ projects:
if (doc!=null) {
Element rootElement = doc.getDocumentElement();
NodeList providerNodes = rootElement.getElementsByTagName(LanguageSettingsSerializable.ELEM_PROVIDER);
NodeList providerNodes = rootElement.getElementsByTagName(LanguageSettingsSerializableProvider.ELEM_PROVIDER);
List<String> userDefinedProvidersIds = new ArrayList<String>();
for (int i=0;i<providerNodes.getLength();i++) {
@ -497,8 +497,8 @@ projects:
LanguageSettingsExtensionManager.ATTR_ID, provider.getId()});
continue;
}
if (provider instanceof LanguageSettingsSerializable) {
LanguageSettingsSerializable lss = (LanguageSettingsSerializable) provider;
if (provider instanceof LanguageSettingsSerializableProvider) {
LanguageSettingsSerializableProvider lss = (LanguageSettingsSerializableProvider) provider;
boolean useWsp = projectElementWspStore!=null && projectElementPrjStore!=projectElementWspStore;
if (lss.isStoringEntriesInProjectArea() || !useWsp) {
@ -630,8 +630,8 @@ projects:
provider = getWorkspaceProvider(providerId);
} else if (providerNode.getNodeName().equals(LanguageSettingsExtensionManager.ELEM_PROVIDER)) {
provider = loadProvider(providerNode);
if (provider instanceof LanguageSettingsSerializable) {
LanguageSettingsSerializable lss = (LanguageSettingsSerializable) provider;
if (provider instanceof LanguageSettingsSerializableProvider) {
LanguageSettingsSerializableProvider lss = (LanguageSettingsSerializableProvider) provider;
if (!lss.isStoringEntriesInProjectArea() && projectElementWsp!=null) {
loadProviderEntries(lss, cfgId, projectElementWsp);
}
@ -658,7 +658,7 @@ projects:
}
}
private static void loadProviderEntries(LanguageSettingsSerializable provider, String cfgId, Element projectElementWsp) {
private static void loadProviderEntries(LanguageSettingsSerializableProvider provider, String cfgId, Element projectElementWsp) {
/*
<project>
<configuration id="cfg.id">
@ -712,8 +712,8 @@ projects:
String attrClass = XmlUtil.determineAttributeValue(providerNode, LanguageSettingsExtensionManager.ATTR_CLASS);
ILanguageSettingsProvider provider = LanguageSettingsExtensionManager.getProviderInstance(attrClass);
if (provider instanceof LanguageSettingsSerializable)
((LanguageSettingsSerializable)provider).load((Element) providerNode);
if (provider instanceof LanguageSettingsSerializableProvider)
((LanguageSettingsSerializableProvider)provider).load((Element) providerNode);
return provider;
}
@ -1087,7 +1087,8 @@ projects:
* @param languageId - language ID.
* @param folder - container where the tree roots.
*/
public static void buildResourceTree(LanguageSettingsSerializable provider, ICConfigurationDescription cfgDescription, String languageId, IContainer folder) {
public static void buildResourceTree(LanguageSettingsSerializableProvider provider,
ICConfigurationDescription cfgDescription, String languageId, IContainer folder) {
IResource[] members = null;
try {
members = folder.members();

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

@ -25,7 +25,7 @@ import java.util.Set;
import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsProvider;
import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsManager;
import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsSerializable;
import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsSerializableProvider;
import org.eclipse.cdt.core.settings.model.CExternalSetting;
import org.eclipse.cdt.core.settings.model.ICBuildSetting;
import org.eclipse.cdt.core.settings.model.ICConfigExtensionReference;
@ -1041,8 +1041,8 @@ public class CConfigurationSpecSettings implements ICSettingsStorage{
if (LanguageSettingsManager.isWorkspaceProvider(provider)) {
provider = LanguageSettingsManager.getRawProvider(provider);
}
if (provider instanceof LanguageSettingsSerializable) {
LanguageSettingsStorage store = ((LanguageSettingsSerializable) provider).getStorageInternal();
if (provider instanceof LanguageSettingsSerializableProvider) {
LanguageSettingsStorage store = ((LanguageSettingsSerializableProvider) provider).getStorageInternal();
if (!store.isEmpty()) {
newStateShallow.put(provider.getId(), store);
}

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

@ -46,7 +46,7 @@ import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsEditabl
import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsProvider;
import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsBaseProvider;
import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsManager;
import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsSerializable;
import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsSerializableProvider;
import org.eclipse.cdt.core.language.settings.providers.ScannerDiscoveryLegacySupport;
import org.eclipse.cdt.core.model.ILanguage;
import org.eclipse.cdt.core.model.LanguageManager;
@ -682,7 +682,7 @@ public class LanguageSettingsEntriesTab extends AbstractCPropertyTab {
}
private void saveEntries(ILanguageSettingsProvider provider, List<ICLanguageSettingEntry> entries) {
if (provider instanceof LanguageSettingsSerializable) {
if (provider instanceof LanguageSettingsSerializableProvider) {
ICConfigurationDescription cfgDescription = getConfigurationDescription();
IResource rc = getResource();
if (entries!=null && rc!=null) {
@ -697,7 +697,7 @@ public class LanguageSettingsEntriesTab extends AbstractCPropertyTab {
entries = null;
}
}
((LanguageSettingsSerializable)provider).setSettingEntries(cfgDescription, rc, currentLanguageId, entries);
((LanguageSettingsSerializableProvider)provider).setSettingEntries(cfgDescription, rc, currentLanguageId, entries);
}
}

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

@ -49,7 +49,7 @@ import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsEditabl
import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsProvider;
import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsManager;
import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsManager_TBD;
import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsSerializable;
import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsSerializableProvider;
import org.eclipse.cdt.core.language.settings.providers.ScannerDiscoveryLegacySupport;
import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
import org.eclipse.cdt.core.settings.model.ICResourceDescription;
@ -403,8 +403,8 @@ public class LanguageSettingsProviderTab extends AbstractCPropertyTab {
if (isGlobal != LanguageSettingsManager.isWorkspaceProvider(provider)) {
provider = toggleGlobalProvider(provider, isGlobal);
}
projectStorageCheckBox.setSelection(provider instanceof LanguageSettingsSerializable
&& ((LanguageSettingsSerializable) provider).isStoringEntriesInProjectArea());
projectStorageCheckBox.setSelection(provider instanceof LanguageSettingsSerializableProvider
&& ((LanguageSettingsSerializableProvider) provider).isStoringEntriesInProjectArea());
}
@Override
@ -421,8 +421,8 @@ public class LanguageSettingsProviderTab extends AbstractCPropertyTab {
public void widgetSelected(SelectionEvent e) {
boolean isWithProject = projectStorageCheckBox.getSelection();
ILanguageSettingsProvider provider = getWorkingCopy(getSelectedProvider().getId());
Assert.isTrue(provider instanceof LanguageSettingsSerializable);
((LanguageSettingsSerializable)provider).setStoringEntriesInProjectArea(isWithProject);
Assert.isTrue(provider instanceof LanguageSettingsSerializableProvider);
((LanguageSettingsSerializableProvider)provider).setStoringEntriesInProjectArea(isWithProject);
refreshItem(provider);
}
@ -607,9 +607,9 @@ public class LanguageSettingsProviderTab extends AbstractCPropertyTab {
globalProviderCheckBox.setVisible(provider!=null);
projectStorageCheckBox.setEnabled(!isGlobal);
projectStorageCheckBox.setVisible(rawProvider instanceof LanguageSettingsSerializable);
projectStorageCheckBox.setSelection(provider instanceof LanguageSettingsSerializable
&& ((LanguageSettingsSerializable)provider).isStoringEntriesInProjectArea());
projectStorageCheckBox.setVisible(rawProvider instanceof LanguageSettingsSerializableProvider);
projectStorageCheckBox.setSelection(provider instanceof LanguageSettingsSerializableProvider
&& ((LanguageSettingsSerializableProvider)provider).isStoringEntriesInProjectArea());
boolean needPreferencesLink=isGlobal && currentOptionsPage!=null;
// TODO: message

6
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsProvidersLabelProvider.java
View file

@ -19,7 +19,7 @@ import org.eclipse.swt.graphics.Image;
import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsProvider;
import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsManager;
import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsSerializable;
import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsSerializableProvider;
import org.eclipse.cdt.ui.CDTSharedImages;
@ -69,8 +69,8 @@ class LanguageSettingsProvidersLabelProvider extends LabelProvider {
// boolean isSpecial = provider.getId().equals(LegacySupport.MBS_LANGUAGE_SETTINGS_PROVIDER);
ILanguageSettingsProvider rawProvider = LanguageSettingsManager.getRawProvider(provider);
if (rawProvider instanceof LanguageSettingsSerializable) {
if (((LanguageSettingsSerializable)rawProvider).isEmpty()) {
if (rawProvider instanceof LanguageSettingsSerializableProvider) {
if (((LanguageSettingsSerializableProvider)rawProvider).isEmpty()) {
overlayKeys[IDecoration.BOTTOM_RIGHT] = CDTSharedImages.IMG_OVR_EMPTY;
}
}

6
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/UserLanguageSettingsProvider.java
View file

@ -12,14 +12,14 @@
package org.eclipse.cdt.internal.ui.language.settings.providers;
import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsEditableProvider;
import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsSerializable;
import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsSerializableProvider;
/**
* Provider to support user interface for language settings. The important difference with
* {@link LanguageSettingsSerializable} is that it implements {@link ILanguageSettingsEditableProvider}.
* {@link LanguageSettingsSerializableProvider} is that it implements {@link ILanguageSettingsEditableProvider}.
*
*/
public class UserLanguageSettingsProvider extends LanguageSettingsSerializable implements ILanguageSettingsEditableProvider {
public class UserLanguageSettingsProvider extends LanguageSettingsSerializableProvider implements ILanguageSettingsEditableProvider {
@Override
public int hashCode() {