From de3b172c7dbd1cbff5ffd59067c138f43e410afc Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Mon, 21 Mar 2016 18:41:24 -0700 Subject: [PATCH] Bug 489563 - API change for Language Settings Providers. Restored binary compatibility of LanguageSettingsSerializableProvider. Change-Id: I02c9c7b0cc98a72ef47798a74f7a6ff99e85cf46 --- .../tests/BuiltinSpecsDetectorTest.java | 23 +-- .../tests/GCCBuildCommandParserTest.java | 17 +- .../tests/GCCBuiltinSpecsDetectorTest.java | 31 ++-- .../LanguageSettingsExtensionsTests.java | 7 +- .../LanguageSettingsListenersTests.java | 4 +- .../LanguageSettingsManagerTests.java | 4 +- ...nguageSettingsPersistenceProjectTests.java | 26 +-- ...ttingsProviderReferencedProjectsTests.java | 8 +- ...uageSettingsSerializableProviderTests.java | 168 +++++++++--------- .../LanguageSettingsSerializableProvider.java | 21 ++- 10 files changed, 165 insertions(+), 144 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/BuiltinSpecsDetectorTest.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/BuiltinSpecsDetectorTest.java index 0f890437d03..89ea9b4ae83 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/BuiltinSpecsDetectorTest.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/BuiltinSpecsDetectorTest.java @@ -291,7 +291,7 @@ public class BuiltinSpecsDetectorTest extends BaseTestCase { assertEquals(PROVIDER_ID, provider.getId()); assertEquals(PROVIDER_NAME, provider.getName()); assertEquals(null, provider.getLanguageScope()); - assertEquals(null, provider.getSettingEntries(null, null, null)); + assertEquals(null, provider.getSettingEntries((IBuildConfiguration) null, null, null)); assertEquals("", provider.getCommand()); assertEquals(false, provider.isExecuted()); assertEquals(false, provider.isConsoleEnabled()); @@ -313,7 +313,7 @@ public class BuiltinSpecsDetectorTest extends BaseTestCase { assertEquals(PROVIDER_ID, provider.getId()); assertEquals(PROVIDER_NAME, provider.getName()); assertEquals(languages, provider.getLanguageScope()); - assertEquals(entries, provider.getSettingEntries(null, null, null)); + assertEquals(entries, provider.getSettingEntries((IBuildConfiguration) null, null, null)); assertEquals(CUSTOM_COMMAND_1, provider.getCommand()); assertEquals(false, provider.isConsoleEnabled()); assertEquals(false, provider.isExecuted()); @@ -326,7 +326,7 @@ public class BuiltinSpecsDetectorTest extends BaseTestCase { provider.execute(); assertEquals(true, provider.isExecuted()); - assertEquals(null, provider.getSettingEntries(null, null, null)); + assertEquals(null, provider.getSettingEntries((IBuildConfiguration) null, null, null)); } } @@ -414,7 +414,7 @@ public class BuiltinSpecsDetectorTest extends BaseTestCase { List entries2 = new ArrayList(); entries2.add( new CMacroEntry("MACRO2", "VALUE2", ICSettingEntry.BUILTIN | ICSettingEntry.READONLY)); - clone.setSettingEntries(null, null, null, entries2); + clone.setSettingEntries((IBuildConfiguration) null, null, null, entries2); assertFalse(provider.equals(clone)); } @@ -425,7 +425,7 @@ public class BuiltinSpecsDetectorTest extends BaseTestCase { assertEquals(false, clone.isExecuted()); assertFalse(provider2.equals(clone)); - provider2.setSettingEntries(null, null, null, null); + provider2.setSettingEntries((IBuildConfiguration) null, null, null, null); assertFalse(provider2.equals(clone)); clone.execute(); @@ -493,7 +493,7 @@ public class BuiltinSpecsDetectorTest extends BaseTestCase { MockBuiltinSpecsDetectorExecutedFlag provider = new MockBuiltinSpecsDetectorExecutedFlag(); List entries = new ArrayList(); entries.add(new CIncludePathEntry("path0", 1)); - provider.setSettingEntries(null, null, null, entries); + provider.setSettingEntries((IBuildConfiguration) null, null, null, entries); // serialize entries Document doc = XmlUtil.newDocument(); rootElement = XmlUtil.appendElement(doc, ELEM_TEST); @@ -511,7 +511,7 @@ public class BuiltinSpecsDetectorTest extends BaseTestCase { // load the XML to the new provider provider.load(rootElement); - List entries = provider.getSettingEntries(null, null, null); + List entries = provider.getSettingEntries((IBuildConfiguration) null, null, null); assertNotNull(entries); assertTrue(entries.size() > 0); assertEquals(new CIncludePathEntry("path0", 1), entries.get(0)); @@ -532,7 +532,7 @@ public class BuiltinSpecsDetectorTest extends BaseTestCase { // execute provider provider.execute(); - List entries = provider.getSettingEntries(null, null, null); + List entries = provider.getSettingEntries((IBuildConfiguration) null, null, null); assertEquals(null, entries); // executed provider should NOT appear as empty even with no entries set assertEquals(false, provider.isEmpty()); @@ -586,7 +586,7 @@ public class BuiltinSpecsDetectorTest extends BaseTestCase { assertFalse(provider.isEmpty()); - List noentries = provider.getSettingEntries(null, null, null); + List noentries = provider.getSettingEntries((IBuildConfiguration) null, null, null); assertNull(noentries); // Check parsed entries @@ -617,7 +617,8 @@ public class BuiltinSpecsDetectorTest extends BaseTestCase { assertFalse(provider.isEmpty()); // Check parsed entries - List entries = provider.getSettingEntries(null, null, LANGUAGE_ID); + List entries = + provider.getSettingEntries((IBuildConfiguration) null, null, LANGUAGE_ID); ICLanguageSettingEntry expected = new CMacroEntry("MACRO", "VALUE", ICSettingEntry.BUILTIN | ICSettingEntry.READONLY); assertEquals(expected, entries.get(0)); @@ -1055,7 +1056,7 @@ public class BuiltinSpecsDetectorTest extends BaseTestCase { provider.shutdown(); // compare benchmarks, expected well-sorted - List entries = provider.getSettingEntries(null, null, null); + List entries = provider.getSettingEntries((IBuildConfiguration) null, null, null); int i = 0; assertEquals(includePath_1, entries.get(i++)); diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/GCCBuildCommandParserTest.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/GCCBuildCommandParserTest.java index 7a7b7876d7f..d2fa145ba46 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/GCCBuildCommandParserTest.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/GCCBuildCommandParserTest.java @@ -198,7 +198,6 @@ public class GCCBuildCommandParserTest extends BaseTestCase { Set referencedProjectsNames = new LinkedHashSet(refs.keySet()); assertEquals(projectReferenced.getName(), referencedProjectsNames.toArray()[0]); } - } /** @@ -213,7 +212,7 @@ public class GCCBuildCommandParserTest extends BaseTestCase { assertEquals(PROVIDER_ID, provider.getId()); assertEquals(PROVIDER_NAME, provider.getName()); assertEquals(null, provider.getLanguageScope()); - assertEquals(null, provider.getSettingEntries(null, null, null)); + assertEquals(null, provider.getSettingEntries((IBuildConfiguration) null, null, null)); assertEquals("", provider.getCompilerPattern()); assertEquals(AbstractBuildCommandParser.ResourceScope.FILE, provider.getResourceScope()); } @@ -234,7 +233,7 @@ public class GCCBuildCommandParserTest extends BaseTestCase { assertEquals(PROVIDER_ID, provider.getId()); assertEquals(PROVIDER_NAME, provider.getName()); assertEquals(languages, provider.getLanguageScope()); - assertEquals(entries, provider.getSettingEntries(null, null, null)); + assertEquals(entries, provider.getSettingEntries((IBuildConfiguration) null, null, null)); assertEquals(CUSTOM_PARAMETER, provider.getCompilerPattern()); // setters @@ -359,7 +358,7 @@ public class GCCBuildCommandParserTest extends BaseTestCase { parser.processLine(null); parser.shutdown(); - List entries = parser.getSettingEntries(null, null, null); + List entries = parser.getSettingEntries((IBuildConfiguration) null, null, null); assertNull(entries); } @@ -1080,11 +1079,11 @@ public class GCCBuildCommandParserTest extends BaseTestCase { // check entries assertEquals(new CIncludePathEntry("/path0", 0), - parser.getSettingEntries(null, file, languageId).get(0)); + parser.getSettingEntries((IBuildConfiguration) null, file, languageId).get(0)); assertEquals( new CIncludePathEntry(file.getParent().getFullPath(), ICSettingEntry.VALUE_WORKSPACE_PATH | ICSettingEntry.RESOLVED), - parser.getSettingEntries(null, file, languageId).get(1)); + parser.getSettingEntries((IBuildConfiguration) null, file, languageId).get(1)); } /** @@ -2019,7 +2018,7 @@ public class GCCBuildCommandParserTest extends BaseTestCase { parser.processLine("gcc file.wrong-content-type"); parser.shutdown(); - List entries = parser.getSettingEntries(null, null, null); + List entries = parser.getSettingEntries((IBuildConfiguration) null, null, null); assertNull(entries); } @@ -2382,7 +2381,7 @@ public class GCCBuildCommandParserTest extends BaseTestCase { // check populated entries List expected = new ArrayList(); expected.add(new CIncludePathEntry("/path0", 0)); - assertEquals(expected, parser.getSettingEntries(null, null, LANG_CPP)); + assertEquals(expected, parser.getSettingEntries((IBuildConfiguration) null, null, LANG_CPP)); } /** @@ -2477,7 +2476,7 @@ public class GCCBuildCommandParserTest extends BaseTestCase { parser.shutdown(); // check entries - List entries = parser.getSettingEntries(null, null, LANG_CPP); + List entries = parser.getSettingEntries((IBuildConfiguration) null, null, LANG_CPP); assertEquals(new CIncludePathEntry("/path0", 0), entries.get(0)); } diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/GCCBuiltinSpecsDetectorTest.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/GCCBuiltinSpecsDetectorTest.java index 4fc6d9b9946..4cf93cfbeab 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/GCCBuiltinSpecsDetectorTest.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/GCCBuiltinSpecsDetectorTest.java @@ -36,6 +36,7 @@ import org.eclipse.cdt.managedbuilder.internal.language.settings.providers.GCCBu import org.eclipse.cdt.managedbuilder.language.settings.providers.AbstractBuiltinSpecsDetector; import org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector; import org.eclipse.cdt.managedbuilder.testplugin.ManagedBuildTestHelper; +import org.eclipse.core.resources.IBuildConfiguration; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; @@ -197,7 +198,7 @@ public class GCCBuiltinSpecsDetectorTest extends BaseTestCase { detector.shutdownForLanguage(); detector.shutdown(); - List entries = detector.getSettingEntries(null, null, null); + List entries = detector.getSettingEntries((IBuildConfiguration) null, null, null); assertEquals(new CMacroEntry("MACRO", null, ICSettingEntry.BUILTIN | ICSettingEntry.READONLY), entries.get(0)); assertEquals(1, entries.size()); } @@ -214,7 +215,7 @@ public class GCCBuiltinSpecsDetectorTest extends BaseTestCase { detector.shutdownForLanguage(); detector.shutdown(); - List entries = detector.getSettingEntries(null, null, null); + List entries = detector.getSettingEntries((IBuildConfiguration) null, null, null); assertEquals(new CMacroEntry("MACRO", "VALUE", ICSettingEntry.BUILTIN | ICSettingEntry.READONLY), entries.get(0)); assertEquals(1, entries.size()); } @@ -231,7 +232,7 @@ public class GCCBuiltinSpecsDetectorTest extends BaseTestCase { detector.shutdownForLanguage(); detector.shutdown(); - List entries = detector.getSettingEntries(null, null, null); + List entries = detector.getSettingEntries((IBuildConfiguration) null, null, null); assertEquals(new CMacroEntry("MACRO", "(3)", ICSettingEntry.BUILTIN | ICSettingEntry.READONLY), entries.get(0)); assertEquals(1, entries.size()); } @@ -251,7 +252,7 @@ public class GCCBuiltinSpecsDetectorTest extends BaseTestCase { detector.shutdownForLanguage(); detector.shutdown(); - List entries = detector.getSettingEntries(null, null, null); + List entries = detector.getSettingEntries((IBuildConfiguration) null, null, null); int index = 0; assertEquals(new CMacroEntry("MACRO_1", "VALUE", ICSettingEntry.BUILTIN | ICSettingEntry.READONLY), entries.get(index++)); assertEquals(new CMacroEntry("MACRO_2", "VALUE", ICSettingEntry.BUILTIN | ICSettingEntry.READONLY), entries.get(index++)); @@ -272,7 +273,7 @@ public class GCCBuiltinSpecsDetectorTest extends BaseTestCase { detector.shutdownForLanguage(); detector.shutdown(); - List entries = detector.getSettingEntries(null, null, null); + List entries = detector.getSettingEntries((IBuildConfiguration) null, null, null); assertEquals(new CMacroEntry("MACRO()", "VALUE", ICSettingEntry.BUILTIN | ICSettingEntry.READONLY), entries.get(0)); assertEquals(1, entries.size()); } @@ -289,7 +290,7 @@ public class GCCBuiltinSpecsDetectorTest extends BaseTestCase { detector.shutdownForLanguage(); detector.shutdown(); - List entries = detector.getSettingEntries(null, null, null); + List entries = detector.getSettingEntries((IBuildConfiguration) null, null, null); assertEquals(new CMacroEntry("MACRO(X)", "VALUE", ICSettingEntry.BUILTIN | ICSettingEntry.READONLY), entries.get(0)); assertEquals(1, entries.size()); } @@ -306,7 +307,7 @@ public class GCCBuiltinSpecsDetectorTest extends BaseTestCase { detector.shutdownForLanguage(); detector.shutdown(); - List entries = detector.getSettingEntries(null, null, null); + List entries = detector.getSettingEntries((IBuildConfiguration) null, null, null); assertEquals(new CMacroEntry("MACRO(P1, P2)", "VALUE(P1, P2)", ICSettingEntry.BUILTIN | ICSettingEntry.READONLY), entries.get(0)); assertEquals(1, entries.size()); } @@ -323,7 +324,7 @@ public class GCCBuiltinSpecsDetectorTest extends BaseTestCase { detector.shutdownForLanguage(); detector.shutdown(); - List entries = detector.getSettingEntries(null, null, null); + List entries = detector.getSettingEntries((IBuildConfiguration) null, null, null); assertEquals(new CMacroEntry("MACRO(P1, P2)", null, ICSettingEntry.BUILTIN | ICSettingEntry.READONLY), entries.get(0)); assertEquals(1, entries.size()); } @@ -342,7 +343,7 @@ public class GCCBuiltinSpecsDetectorTest extends BaseTestCase { detector.shutdownForLanguage(); detector.shutdown(); - List entries = detector.getSettingEntries(null, null, null); + List entries = detector.getSettingEntries((IBuildConfiguration) null, null, null); int index = 0; assertEquals(new CMacroEntry("MACRO_1(P1, P2)", "VALUE(P1, P2)", ICSettingEntry.BUILTIN | ICSettingEntry.READONLY), entries.get(index++)); assertEquals(new CMacroEntry("MACRO_2(P1, P2)", "VALUE(P1, P2)", ICSettingEntry.BUILTIN | ICSettingEntry.READONLY), entries.get(index++)); @@ -389,7 +390,7 @@ public class GCCBuiltinSpecsDetectorTest extends BaseTestCase { detector.shutdownForLanguage(); detector.shutdown(); - List entries = detector.getSettingEntries(null, null, null); + List entries = detector.getSettingEntries((IBuildConfiguration) null, null, null); int index = 0; assertEquals(new CIncludePathEntry(loc+"/local/include", ICSettingEntry.LOCAL | ICSettingEntry.BUILTIN | ICSettingEntry.READONLY), entries.get(index++)); assertEquals(new CIncludePathEntry(loc+"/usr/include", ICSettingEntry.BUILTIN | ICSettingEntry.READONLY), entries.get(index++)); @@ -422,7 +423,7 @@ public class GCCBuiltinSpecsDetectorTest extends BaseTestCase { detector.shutdownForLanguage(); detector.shutdown(); - List entries = detector.getSettingEntries(null, null, null); + List entries = detector.getSettingEntries((IBuildConfiguration) null, null, null); int index = 0; assertEquals(new CIncludePathEntry(loc+"/local/include", ICSettingEntry.LOCAL | ICSettingEntry.BUILTIN | ICSettingEntry.READONLY), entries.get(index++)); assertEquals(new CIncludePathEntry(loc+"/usr/include", ICSettingEntry.BUILTIN | ICSettingEntry.READONLY), entries.get(index++)); @@ -461,7 +462,7 @@ public class GCCBuiltinSpecsDetectorTest extends BaseTestCase { detector.shutdown(); // check populated entries - List entries = detector.getSettingEntries(null, null, null); + List entries = detector.getSettingEntries((IBuildConfiguration) null, null, null); assertEquals(new CIncludePathEntry(dir2.removeLastSegments(1), ICSettingEntry.BUILTIN | ICSettingEntry.READONLY), entries.get(0)); assertEquals(1, entries.size()); } @@ -491,7 +492,7 @@ public class GCCBuiltinSpecsDetectorTest extends BaseTestCase { detector.shutdownForLanguage(); detector.shutdown(); - List entries = detector.getSettingEntries(null, null, null); + List entries = detector.getSettingEntries((IBuildConfiguration) null, null, null); int index = 0; assertEquals(new CIncludePathEntry(loc+"/usr/include", ICSettingEntry.BUILTIN | ICSettingEntry.READONLY), entries.get(index++)); assertEquals(index, entries.size()); @@ -520,7 +521,7 @@ public class GCCBuiltinSpecsDetectorTest extends BaseTestCase { detector.shutdown(); // check populated entries - List entries = detector.getSettingEntries(null, null, null); + List entries = detector.getSettingEntries((IBuildConfiguration) null, null, null); assertEquals(new CIncludePathEntry(new Path(windowsLocation), ICSettingEntry.BUILTIN | ICSettingEntry.READONLY), entries.get(0)); assertEquals(1, entries.size()); } @@ -555,7 +556,7 @@ public class GCCBuiltinSpecsDetectorTest extends BaseTestCase { detector.shutdown(); // check populated entries - List entries = detector.getSettingEntries(null, null, null); + List entries = detector.getSettingEntries((IBuildConfiguration) null, null, null); assertEquals(new CIncludePathEntry(new Path(windowsLocation), ICSettingEntry.BUILTIN | ICSettingEntry.READONLY), entries.get(0)); assertEquals(1, entries.size()); } diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsExtensionsTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsExtensionsTests.java index 9f3f1fa7eab..3aaf79fdc52 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsExtensionsTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsExtensionsTests.java @@ -16,8 +16,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import junit.framework.TestSuite; - import org.eclipse.cdt.core.settings.model.CIncludeFileEntry; import org.eclipse.cdt.core.settings.model.CIncludePathEntry; import org.eclipse.cdt.core.settings.model.CLibraryFileEntry; @@ -29,10 +27,13 @@ import org.eclipse.cdt.core.settings.model.ICSettingEntry; import org.eclipse.cdt.core.testplugin.util.BaseTestCase; import org.eclipse.cdt.internal.core.language.settings.providers.LanguageSettingsExtensionManager; import org.eclipse.cdt.internal.core.language.settings.providers.LanguageSettingsProvidersSerializer; +import org.eclipse.core.resources.IBuildConfiguration; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.Path; +import junit.framework.TestSuite; + /** * Test cases testing LanguageSettingsProvider extensions */ @@ -338,7 +339,7 @@ public class LanguageSettingsExtensionsTests extends BaseTestCase { List expected = new ArrayList(); expected.add(EXTENSION_EDITABLE_PROVIDER_ENTRY); - assertEquals(expected, provider.getSettingEntries(null, null, null)); + assertEquals(expected, provider.getSettingEntries((IBuildConfiguration) null, null, null)); } /** diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsListenersTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsListenersTests.java index b9992523213..8226740933d 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsListenersTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsListenersTests.java @@ -1162,7 +1162,7 @@ public class LanguageSettingsListenersTests extends BaseTestCase { // add entries List entries = new ArrayList(); entries.add(SAMPLE_LSE); - ((MockLanguageSettingsEditableProvider) rawProvider).setSettingEntries(null, project, null, entries); + ((MockLanguageSettingsEditableProvider) rawProvider).setSettingEntries((IBuildConfiguration) null, project, null, entries); assertEquals(SAMPLE_LSE, wspProvider.getSettingEntries((IBuildConfiguration) null, project, null).get(0)); // reset count @@ -1245,7 +1245,7 @@ public class LanguageSettingsListenersTests extends BaseTestCase { ILanguageSettingsProvider rawProvider = LanguageSettingsManager.getRawProvider(wspProvider); assertTrue(rawProvider instanceof MockLanguageSettingsEditableProvider); // reset the provider to match extension - ((MockLanguageSettingsEditableProvider) rawProvider).setSettingEntries(null, null, null, extEntries); + ((MockLanguageSettingsEditableProvider) rawProvider).setSettingEntries((IBuildConfiguration) null, null, null, extEntries); assertTrue(LanguageSettingsManager.isEqualExtensionProvider(rawProvider, true)); // reset count diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsManagerTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsManagerTests.java index 73b39c51c01..f0b361db094 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsManagerTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsManagerTests.java @@ -867,7 +867,7 @@ public class LanguageSettingsManagerTests extends BaseTestCase { List newEntries = new ArrayList(); newEntries.add(new CIncludePathEntry("path0", 0)); newEntries.add(new CIncludePathEntry("path1", 0)); - ((LanguageSettingsSerializableProvider) rawProvider).setSettingEntries(null, null, null, newEntries); + ((LanguageSettingsSerializableProvider) rawProvider).setSettingEntries((IBuildConfiguration) null, null, null, newEntries); // check that the workspace provider gets them too List newRawEntries = rawProvider.getSettingEntries((IBuildConfiguration) null, null, @@ -912,7 +912,7 @@ public class LanguageSettingsManagerTests extends BaseTestCase { List providers = new ArrayList(); LanguageSettingsSerializableProvider newRawProvider = new LanguageSettingsSerializableProvider( EXTENSION_EDITABLE_PROVIDER_ID, PROVIDER_NAME_0); - newRawProvider.setSettingEntries(null, null, null, newEntries); + newRawProvider.setSettingEntries((IBuildConfiguration) null, null, null, newEntries); providers.add(newRawProvider); LanguageSettingsManager.setWorkspaceProviders(providers); } diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsPersistenceProjectTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsPersistenceProjectTests.java index f87407add8d..691fc39f03d 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsPersistenceProjectTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsPersistenceProjectTests.java @@ -388,8 +388,8 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase { assertEquals(EXTENSION_SERIALIZABLE_PROVIDER_ID, extProvider.getId()); // add entries - extProvider.setSettingEntries(null, null, null, entries); - List actual = extProvider.getSettingEntries(null, null, null); + extProvider.setSettingEntries((IBuildConfiguration) null, null, null, entries); + List actual = extProvider.getSettingEntries((IBuildConfiguration) null, null, null); assertEquals(entries.get(0), actual.get(0)); assertEquals(entries.size(), actual.size()); @@ -397,7 +397,7 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase { LanguageSettingsManager.serializeLanguageSettingsWorkspace(); // clear the provider - extProvider.setSettingEntries(null, null, null, null); + extProvider.setSettingEntries((IBuildConfiguration) null, null, null, null); } { @@ -460,7 +460,7 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase { assertTrue(rawProvider instanceof LanguageSettingsSerializableProvider); List entries = new ArrayList(); entries.add(new CIncludePathEntry("path0", 0)); - ((LanguageSettingsSerializableProvider) rawProvider).setSettingEntries(null, null, null, entries); + ((LanguageSettingsSerializableProvider) rawProvider).setSettingEntries((IBuildConfiguration) null, null, null, entries); // check that the extension provider is not affected assertTrue(!LanguageSettingsManager.isEqualExtensionProvider(rawProvider, true)); @@ -594,7 +594,7 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase { LanguageSettingsSerializableProvider serializableProvider = new LanguageSettingsSerializableProvider( PROVIDER_0, PROVIDER_NAME_0); - serializableProvider.setSettingEntries(null, null, null, entries); + serializableProvider.setSettingEntries((IBuildConfiguration) null, null, null, entries); LanguageSettingsManager.setStoringEntriesInProjectArea(serializableProvider, true); ArrayList providers = new ArrayList(); @@ -657,7 +657,7 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase { .getExtensionProviderCopy(EXTENSION_EDITABLE_PROVIDER_ID, false); assertTrue(provider instanceof MockLanguageSettingsEditableProvider); MockLanguageSettingsEditableProvider serializableProvider = (MockLanguageSettingsEditableProvider) provider; - serializableProvider.setSettingEntries(null, null, null, entries); + serializableProvider.setSettingEntries((IBuildConfiguration) null, null, null, entries); LanguageSettingsManager.setStoringEntriesInProjectArea(serializableProvider, true); ArrayList providers = new ArrayList(); @@ -729,7 +729,7 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase { LanguageSettingsSerializableProvider provider1 = new LanguageSettingsSerializableProvider( PROVIDER_0, PROVIDER_NAME_0); LanguageSettingsManager.setStoringEntriesInProjectArea(provider1, true); - provider1.setSettingEntries(null, null, null, entries); + provider1.setSettingEntries((IBuildConfiguration) null, null, null, entries); ArrayList providers = new ArrayList(); providers.add(provider1); ((ILanguageSettingsProvidersKeeper) cfgDescription1).setLanguageSettingProviders(providers); @@ -744,7 +744,7 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase { LanguageSettingsSerializableProvider provider2 = new LanguageSettingsSerializableProvider( PROVIDER_0, PROVIDER_NAME_0); LanguageSettingsManager.setStoringEntriesInProjectArea(provider2, true); - provider2.setSettingEntries(null, null, null, entries2); + provider2.setSettingEntries((IBuildConfiguration) null, null, null, entries2); ArrayList providers = new ArrayList(); providers.add(provider2); ((ILanguageSettingsProvidersKeeper) cfgDescription2).setLanguageSettingProviders(providers); @@ -867,7 +867,7 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase { LanguageSettingsSerializableProvider serializableProvider = new MockLanguageSettingsSerializableProvider( PROVIDER_0, PROVIDER_NAME_0); - serializableProvider.setSettingEntries(null, null, null, entries); + serializableProvider.setSettingEntries((IBuildConfiguration) null, null, null, entries); LanguageSettingsManager.setStoringEntriesInProjectArea(serializableProvider, true); ArrayList providers = new ArrayList(); @@ -1055,12 +1055,12 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase { LanguageSettingsSerializableProvider mockProvider1 = new LanguageSettingsSerializableProvider( PROVIDER_0, PROVIDER_NAME_0); LanguageSettingsManager.setStoringEntriesInProjectArea(mockProvider1, true); - mockProvider1.setSettingEntries(null, null, null, entries_31); + mockProvider1.setSettingEntries((IBuildConfiguration) null, null, null, entries_31); // 2.2 LanguageSettingsSerializableProvider mockProvider2 = new MockLanguageSettingsSerializableProvider( PROVIDER_2, PROVIDER_NAME_2); LanguageSettingsManager.setStoringEntriesInProjectArea(mockProvider2, true); - mockProvider2.setSettingEntries(null, null, null, entries_32); + mockProvider2.setSettingEntries((IBuildConfiguration) null, null, null, entries_32); ArrayList providers = new ArrayList(); providers.add(providerExt); @@ -1307,7 +1307,7 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase { LanguageSettingsSerializableProvider serializableProvider = new LanguageSettingsSerializableProvider( PROVIDER_0, PROVIDER_NAME_0); - serializableProvider.setSettingEntries(null, null, null, entries); + serializableProvider.setSettingEntries((IBuildConfiguration) null, null, null, entries); // do not store entries inside project LanguageSettingsManager.setStoringEntriesInProjectArea(serializableProvider, false); @@ -1709,7 +1709,7 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase { assertNotNull(rawProvider); assertEquals(EXTENSION_SERIALIZABLE_PROVIDER_ID, rawProvider.getId()); // modify it and add it to the list - rawProvider.setSettingEntries(null, null, null, entries); + rawProvider.setSettingEntries((IBuildConfiguration) null, null, null, entries); providers.add(rawProvider); // set and serialize language settings of workspace providers diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsProviderReferencedProjectsTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsProviderReferencedProjectsTests.java index 65e09e84c61..aae40c73cd7 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsProviderReferencedProjectsTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsProviderReferencedProjectsTests.java @@ -190,7 +190,7 @@ public class LanguageSettingsProviderReferencedProjectsTests extends BaseTestCas // add sample entries ArrayList entries = new ArrayList(); entries.add(nonRefEntry); - ((LanguageSettingsGenericProvider) userProviderNonRef).setSettingEntries(null, null, null, entries); + ((LanguageSettingsGenericProvider) userProviderNonRef).setSettingEntries((IBuildConfiguration) null, null, null, entries); } // Confirm that that does not add entries to the main project { @@ -217,7 +217,7 @@ public class LanguageSettingsProviderReferencedProjectsTests extends BaseTestCas CIncludePathEntry refEntryNotExported = CDataUtil.createCIncludePathEntry("referenced-not-exported", 0); entries.add(refEntry); entries.add(refEntryNotExported); - ((LanguageSettingsGenericProvider) userProviderRef).setSettingEntries(null, null, null, entries); + ((LanguageSettingsGenericProvider) userProviderRef).setSettingEntries((IBuildConfiguration) null, null, null, entries); List entriesActual = LanguageSettingsManager.getSettingEntriesByKind(refConfig, project, null, ICSettingEntry.ALL); assertEquals(entries, entriesActual); @@ -290,7 +290,7 @@ public class LanguageSettingsProviderReferencedProjectsTests extends BaseTestCas ArrayList entries = new ArrayList(); entries.add(entryExportedA); entries.add(entryNotExportedA); - ((LanguageSettingsGenericProvider) userProviderRef).setSettingEntries(null, null, null, entries); + ((LanguageSettingsGenericProvider) userProviderRef).setSettingEntries((IBuildConfiguration) null, null, null, entries); } CIncludePathEntry entryExportedB = CDataUtil.createCIncludePathEntry("referenced-exported-B", @@ -310,7 +310,7 @@ public class LanguageSettingsProviderReferencedProjectsTests extends BaseTestCas ArrayList entries = new ArrayList(); entries.add(entryExportedB); entries.add(entryNotExportedB); - ((LanguageSettingsGenericProvider) userProviderRef).setSettingEntries(null, null, null, entries); + ((LanguageSettingsGenericProvider) userProviderRef).setSettingEntries((IBuildConfiguration) null, null, null, entries); } // Check that the new entries from projectB made it to projectA diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsSerializableProviderTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsSerializableProviderTests.java index 59674cf7b43..2d5d757c17b 100644 --- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsSerializableProviderTests.java +++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsSerializableProviderTests.java @@ -148,8 +148,8 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { mockProvider.setLanguageScope(null); assertEquals(null, mockProvider.getLanguageScope()); - mockProvider.setSettingEntries(null, MOCK_RC, LANG_ID, entries); - List actual = mockProvider.getSettingEntries(null, MOCK_RC, LANG_ID); + mockProvider.setSettingEntries((IBuildConfiguration) null, MOCK_RC, LANG_ID, entries); + List actual = mockProvider.getSettingEntries((IBuildConfiguration) null, MOCK_RC, LANG_ID); assertEquals(entries.get(0), actual.get(0)); assertEquals(entries.size(), actual.size()); assertFalse(mockProvider.isEmpty()); @@ -192,7 +192,7 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { List entries = new ArrayList(); entries.add(new CIncludePathEntry("path0", 1)); - provider.setSettingEntries(null, null, null, entries); + provider.setSettingEntries((IBuildConfiguration) null, null, null, entries); // serialize Document doc = XmlUtil.newDocument(); @@ -216,7 +216,7 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { assertTrue(provider.getLanguageScope().size() > 0); assertEquals(LANG_ID, provider.getLanguageScope().get(0)); - List entries = provider.getSettingEntries(null, null, null); + List entries = provider.getSettingEntries((IBuildConfiguration) null, null, null); assertNotNull(entries); assertTrue(entries.size() > 0); assertEquals(new CIncludePathEntry("path0", 1), entries.get(0)); @@ -241,7 +241,7 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { List entries = new ArrayList(); entries.add(new CIncludePathEntry("path0", 1)); - provider.setSettingEntries(null, null, null, entries); + provider.setSettingEntries((IBuildConfiguration) null, null, null, entries); // serialize Document doc = XmlUtil.newDocument(); @@ -267,7 +267,7 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { assertTrue(provider.getLanguageScope().size() > 0); assertEquals(LANG_ID, provider.getLanguageScope().get(0)); // no entries should be loaded - List entries = provider.getSettingEntries(null, null, null); + List entries = provider.getSettingEntries((IBuildConfiguration) null, null, null); assertNull(entries); } } @@ -290,7 +290,7 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { List entries = new ArrayList(); entries.add(new CIncludePathEntry("path0", 1)); - provider.setSettingEntries(null, null, null, entries); + provider.setSettingEntries((IBuildConfiguration) null, null, null, entries); // serialize Document doc = XmlUtil.newDocument(); @@ -320,7 +320,7 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { assertFalse(VALUE_PARAMETER.equals(provider.getProperty(ATTR_PARAMETER))); assertNull(provider.getLanguageScope()); // entries should be loaded - List entries = provider.getSettingEntries(null, null, null); + List entries = provider.getSettingEntries((IBuildConfiguration) null, null, null); assertNotNull(entries); assertTrue(entries.size() > 0); assertEquals(new CIncludePathEntry("path0", 1), entries.get(0)); @@ -336,10 +336,10 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { // create null provider LanguageSettingsSerializableProvider providerNull = new LanguageSettingsSerializableProvider(PROVIDER_NULL, PROVIDER_NAME_NULL); - assertNull(providerNull.getSettingEntries(null, null, null)); + assertNull(providerNull.getSettingEntries((IBuildConfiguration) null, null, null)); // set and get null entries - providerNull.setSettingEntries(null, null, null, null); - assertNull(providerNull.getSettingEntries(null, null, null)); + providerNull.setSettingEntries((IBuildConfiguration) null, null, null, null); + assertNull(providerNull.getSettingEntries((IBuildConfiguration) null, null, null)); Document doc = XmlUtil.newDocument(); Element rootElement = XmlUtil.appendElement(doc, ELEM_TEST); @@ -351,7 +351,7 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { // re-load and check language settings of the newly loaded provider LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(elementProvider); assertEquals(PROVIDER_NULL, provider.getId()); - List actual = provider.getSettingEntries(null, null, null); + List actual = provider.getSettingEntries((IBuildConfiguration) null, null, null); assertNull(actual); } } @@ -463,15 +463,15 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { 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); + provider.setSettingEntries((IBuildConfiguration) null, null, null, entries); { // doublecheck for language scope itself - List actual = provider.getSettingEntries(null, null, null); + List actual = provider.getSettingEntries((IBuildConfiguration) null, null, null); assertEquals(entries, actual); } { // doublecheck for any language - List actual = provider.getSettingEntries(null, null, LANG_ID_2); + List actual = provider.getSettingEntries((IBuildConfiguration) null, null, LANG_ID_2); assertEquals(entries, actual); } @@ -484,17 +484,17 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { { // check for language scope itself - List actual = provider.getSettingEntries(null, null, null); + List actual = provider.getSettingEntries((IBuildConfiguration) null, null, null); assertEquals(entries, actual); } { // check for language in the language scope - List actual = provider.getSettingEntries(null, null, LANG_ID); + List actual = provider.getSettingEntries((IBuildConfiguration) null, null, LANG_ID); assertEquals(entries, actual); } { // check for language not in scope - List actual = provider.getSettingEntries(null, null, LANG_ID_2); + List actual = provider.getSettingEntries((IBuildConfiguration) null, null, LANG_ID_2); assertNull(actual); } @@ -515,17 +515,17 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { { // check for language scope itself - List actual = provider.getSettingEntries(null, null, null); + List actual = provider.getSettingEntries((IBuildConfiguration) null, null, null); assertEquals(entries, actual); } { // check for language in the language scope - List actual = provider.getSettingEntries(null, null, LANG_ID); + List actual = provider.getSettingEntries((IBuildConfiguration) null, null, LANG_ID); assertEquals(entries, actual); } { // check for language not in scope - List actual = provider.getSettingEntries(null, null, LANG_ID_2); + List actual = provider.getSettingEntries((IBuildConfiguration) null, null, LANG_ID_2); assertNull(actual); } } @@ -543,7 +543,7 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { // create a provider and serialize its settings LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1); - provider.setSettingEntries(null, MOCK_RC, LANG_ID, entries); + provider.setSettingEntries((IBuildConfiguration) null, MOCK_RC, LANG_ID, entries); Document doc = XmlUtil.newDocument(); Element rootElement = XmlUtil.appendElement(doc, ELEM_TEST); @@ -557,7 +557,7 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { // re-load and check language settings of the newly loaded provider LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(elementProvider); assertEquals(PROVIDER_1, provider.getId()); - List actual = provider.getSettingEntries(null, MOCK_RC, LANG_ID); + List actual = provider.getSettingEntries((IBuildConfiguration) null, MOCK_RC, LANG_ID); assertEquals(entries.get(0), actual.get(0)); } } @@ -617,17 +617,17 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { assertEquals(null, provider.getLanguageScope()); // add null language - provider.setSettingEntries(null, MOCK_RC, null, entriesNullLanguage); + provider.setSettingEntries((IBuildConfiguration) null, MOCK_RC, null, entriesNullLanguage); assertEquals(null, provider.getLanguageScope()); { // getter by null language - List actual = provider.getSettingEntries(null, MOCK_RC, null); + List actual = provider.getSettingEntries((IBuildConfiguration) null, MOCK_RC, null); assertEquals(entriesNullLanguage.get(0), actual.get(0)); assertEquals(entriesNullLanguage.size(), actual.size()); } { // getter by any language - should return same entries as null - List actual = provider.getSettingEntries(null, MOCK_RC, LANG_ID); + List actual = provider.getSettingEntries((IBuildConfiguration) null, MOCK_RC, LANG_ID); assertEquals(entriesNullLanguage.get(0), actual.get(0)); assertEquals(entriesNullLanguage.size(), actual.size()); } @@ -637,13 +637,13 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { assertNull(provider.getLanguageScope()); { // getter by null language - List actual = provider.getSettingEntries(null, MOCK_RC, null); + List actual = provider.getSettingEntries((IBuildConfiguration) null, MOCK_RC, null); assertEquals(entriesNullLanguage.get(0), actual.get(0)); assertEquals(entriesNullLanguage.size(), actual.size()); } { // getter by the language - List actual = provider.getSettingEntries(null, MOCK_RC, LANG_ID); + List actual = provider.getSettingEntries((IBuildConfiguration) null, MOCK_RC, LANG_ID); assertEquals(entriesLanguage.get(0), actual.get(0)); assertEquals(entriesLanguage.size(), actual.size()); } @@ -662,13 +662,13 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(elementProvider); { // getter by null language - List actual = provider.getSettingEntries(null, MOCK_RC, null); + List actual = provider.getSettingEntries((IBuildConfiguration) null, MOCK_RC, null); assertEquals(entriesNullLanguage.get(0), actual.get(0)); assertEquals(entriesNullLanguage.size(), actual.size()); } { // getter by the language - List actual = provider.getSettingEntries(null, MOCK_RC, LANG_ID); + List actual = provider.getSettingEntries((IBuildConfiguration) null, MOCK_RC, LANG_ID); assertEquals(entriesLanguage.get(0), actual.get(0)); assertEquals(entriesLanguage.size(), actual.size()); } @@ -720,7 +720,7 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { // create a provider and serialize its settings LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1); - provider.setSettingEntries(null, MOCK_RC, null, entries); + provider.setSettingEntries((IBuildConfiguration) null, MOCK_RC, null, entries); Document doc = XmlUtil.newDocument(); Element rootElement = XmlUtil.appendElement(doc, ELEM_TEST); @@ -735,7 +735,7 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { // re-load and check language settings of the newly loaded provider LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(elementProvider); assertEquals(PROVIDER_1, provider.getId()); - List actual = provider.getSettingEntries(null, MOCK_RC, null); + List actual = provider.getSettingEntries((IBuildConfiguration) null, MOCK_RC, null); assertEquals(entries.get(0), actual.get(0)); } } @@ -752,7 +752,7 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { // create a provider and serialize its settings LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1); - provider.setSettingEntries(null, null, LANG_ID, entries); + provider.setSettingEntries((IBuildConfiguration) null, null, LANG_ID, entries); Document doc = XmlUtil.newDocument(); Element rootElement = XmlUtil.appendElement(doc, ELEM_TEST); @@ -767,7 +767,7 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { // re-load and check language settings of the newly loaded provider LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(elementProvider); assertEquals(PROVIDER_1, provider.getId()); - List actual = provider.getSettingEntries(null, null, LANG_ID); + List actual = provider.getSettingEntries((IBuildConfiguration) null, null, LANG_ID); assertEquals(entries.get(0), actual.get(0)); } } @@ -819,7 +819,7 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { // create a provider and serialize its settings LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1); - provider.setSettingEntries(null, null, null, entries); + provider.setSettingEntries((IBuildConfiguration) null, null, null, entries); Document doc = XmlUtil.newDocument(); Element rootElement = XmlUtil.appendElement(doc, ELEM_TEST); @@ -836,7 +836,7 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { // re-load and check language settings of the newly loaded provider LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(elementProvider); assertEquals(PROVIDER_1, provider.getId()); - List actual = provider.getSettingEntries(null, null, null); + List actual = provider.getSettingEntries((IBuildConfiguration) null, null, null); assertEquals(entries.get(0), actual.get(0)); } } @@ -852,7 +852,7 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { // create a provider and serialize its settings LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1); - provider.setSettingEntries(null, null, null, entries); + provider.setSettingEntries((IBuildConfiguration) null, null, null, entries); Document doc = XmlUtil.newDocument(); Element rootElement = XmlUtil.appendElement(doc, ELEM_TEST); @@ -863,7 +863,7 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(elementProvider); assertEquals(PROVIDER_1, provider.getId()); - List actual = provider.getSettingEntries(null, null, null); + List actual = provider.getSettingEntries((IBuildConfiguration) null, null, null); ICLanguageSettingEntry entry = actual.get(0); assertTrue(entry instanceof CIncludePathEntry); @@ -887,7 +887,7 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { // create a provider and serialize its settings LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1); - provider.setSettingEntries(null, null, null, entries); + provider.setSettingEntries((IBuildConfiguration) null, null, null, entries); Document doc = XmlUtil.newDocument(); Element rootElement = XmlUtil.appendElement(doc, ELEM_TEST); @@ -898,7 +898,7 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(elementProvider); assertEquals(PROVIDER_1, provider.getId()); - List actual = provider.getSettingEntries(null, null, null); + List actual = provider.getSettingEntries((IBuildConfiguration) null, null, null); ICLanguageSettingEntry entry = actual.get(0); assertTrue(entry instanceof CIncludeFileEntry); CIncludeFileEntry includeFileEntry = (CIncludeFileEntry) entry; @@ -921,7 +921,7 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { // create a provider and serialize its settings LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1); - provider.setSettingEntries(null, null, null, entries); + provider.setSettingEntries((IBuildConfiguration) null, null, null, entries); Document doc = XmlUtil.newDocument(); Element rootElement = XmlUtil.appendElement(doc, ELEM_TEST); @@ -932,7 +932,7 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(elementProvider); assertEquals(PROVIDER_1, provider.getId()); - List actual = provider.getSettingEntries(null, null, null); + List actual = provider.getSettingEntries((IBuildConfiguration) null, null, null); ICLanguageSettingEntry entry = actual.get(0); assertTrue(entry instanceof CMacroEntry); CMacroEntry macroEntry = (CMacroEntry) entry; @@ -955,7 +955,7 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { // create a provider and serialize its settings LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1); - provider.setSettingEntries(null, null, null, entries); + provider.setSettingEntries((IBuildConfiguration) null, null, null, entries); Document doc = XmlUtil.newDocument(); Element rootElement = XmlUtil.appendElement(doc, ELEM_TEST); @@ -966,7 +966,7 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(elementProvider); assertEquals(PROVIDER_1, provider.getId()); - List actual = provider.getSettingEntries(null, null, null); + List actual = provider.getSettingEntries((IBuildConfiguration) null, null, null); ICLanguageSettingEntry entry = actual.get(0); assertTrue(entry instanceof CMacroFileEntry); CMacroFileEntry macroFileEntry = (CMacroFileEntry) entry; @@ -989,7 +989,7 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { // create a provider and serialize its settings LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1); - provider.setSettingEntries(null, null, null, entries); + provider.setSettingEntries((IBuildConfiguration) null, null, null, entries); Document doc = XmlUtil.newDocument(); Element rootElement = XmlUtil.appendElement(doc, ELEM_TEST); @@ -1000,7 +1000,7 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(elementProvider); assertEquals(PROVIDER_1, provider.getId()); - List actual = provider.getSettingEntries(null, null, null); + List actual = provider.getSettingEntries((IBuildConfiguration) null, null, null); ICLanguageSettingEntry entry = actual.get(0); assertTrue(entry instanceof CLibraryPathEntry); CLibraryPathEntry libraryPathEntry = (CLibraryPathEntry) entry; @@ -1023,7 +1023,7 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { // create a provider and serialize its settings LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1); - provider.setSettingEntries(null, null, null, entries); + provider.setSettingEntries((IBuildConfiguration) null, null, null, entries); Document doc = XmlUtil.newDocument(); Element rootElement = XmlUtil.appendElement(doc, ELEM_TEST); @@ -1034,7 +1034,7 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(elementProvider); assertEquals(PROVIDER_1, provider.getId()); - List actual = provider.getSettingEntries(null, null, null); + List actual = provider.getSettingEntries((IBuildConfiguration) null, null, null); ICLanguageSettingEntry entry = actual.get(0); assertTrue(entry instanceof CLibraryFileEntry); CLibraryFileEntry libraryFileEntry = (CLibraryFileEntry) entry; @@ -1059,7 +1059,7 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { // create a provider and serialize its settings LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1); - provider.setSettingEntries(null, null, null, entries); + provider.setSettingEntries((IBuildConfiguration) null, null, null, entries); Document doc = XmlUtil.newDocument(); Element rootElement = XmlUtil.appendElement(doc, ELEM_TEST); @@ -1070,7 +1070,7 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(elementProvider); assertEquals(PROVIDER_1, provider.getId()); - List actual = provider.getSettingEntries(null, null, null); + List actual = provider.getSettingEntries((IBuildConfiguration) null, null, null); assertEquals(entries.get(0), actual.get(0)); assertEquals(entries.get(1), actual.get(1)); assertEquals(entries.get(2), actual.get(2)); @@ -1097,7 +1097,7 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { // create a provider and serialize its settings LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1); - provider.setSettingEntries(null, null, null, entries); + provider.setSettingEntries((IBuildConfiguration) null, null, null, entries); Document doc = XmlUtil.newDocument(); Element rootElement = XmlUtil.appendElement(doc, ELEM_TEST); @@ -1108,7 +1108,7 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(elementProvider); assertEquals(PROVIDER_1, provider.getId()); - List actual = provider.getSettingEntries(null, null, null); + List actual = provider.getSettingEntries((IBuildConfiguration) null, null, null); ICLanguageSettingEntry entry = actual.get(0); assertTrue(entry instanceof CIncludePathEntry); @@ -1136,8 +1136,8 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { // create a provider LanguageSettingsSerializableProvider mockProvider = null; mockProvider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1); - mockProvider.setSettingEntries(null, null, null, entries); - mockProvider.setSettingEntries(null, null, LANG_ID, entries2); + mockProvider.setSettingEntries((IBuildConfiguration) null, null, null, entries); + mockProvider.setSettingEntries((IBuildConfiguration) null, null, LANG_ID, entries2); // serialize language settings to DOM Document doc = XmlUtil.newDocument(); @@ -1149,11 +1149,11 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { LanguageSettingsSerializableProvider loadedProvider = new LanguageSettingsSerializableProvider( elementProvider); - List actual = loadedProvider.getSettingEntries(null, null, null); + List actual = loadedProvider.getSettingEntries((IBuildConfiguration) null, null, null); assertEquals(entries.get(0), actual.get(0)); assertEquals(entries.size(), actual.size()); - List actual2 = loadedProvider.getSettingEntries(null, null, LANG_ID); + List actual2 = loadedProvider.getSettingEntries((IBuildConfiguration) null, null, LANG_ID); assertEquals(entries2.get(0), actual2.get(0)); assertEquals(entries2.size(), actual2.size()); } @@ -1174,8 +1174,8 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { // create a provider 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); + mockProvider.setSettingEntries((IBuildConfiguration) null, null, LANG_ID_1, entries); + mockProvider.setSettingEntries((IBuildConfiguration) null, null, LANG_ID_2, entries2); // serialize language settings to DOM Document doc = XmlUtil.newDocument(); @@ -1189,11 +1189,11 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { LanguageSettingsSerializableProvider loadedProvider = new LanguageSettingsSerializableProvider( elementProvider); - List actual = loadedProvider.getSettingEntries(null, null, LANG_ID_1); + List actual = loadedProvider.getSettingEntries((IBuildConfiguration) null, null, LANG_ID_1); assertEquals(entries.get(0), actual.get(0)); assertEquals(entries.size(), actual.size()); - List actual2 = loadedProvider.getSettingEntries(null, null, LANG_ID_2); + List actual2 = loadedProvider.getSettingEntries((IBuildConfiguration) null, null, LANG_ID_2); assertEquals(entries2.get(0), actual2.get(0)); assertEquals(entries2.size(), actual2.size()); } @@ -1222,8 +1222,8 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { // create a provider LanguageSettingsSerializableProvider mockProvider = null; mockProvider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1); - mockProvider.setSettingEntries(null, rc1, null, entries); - mockProvider.setSettingEntries(null, rc2, null, entries2); + mockProvider.setSettingEntries((IBuildConfiguration) null, rc1, null, entries); + mockProvider.setSettingEntries((IBuildConfiguration) null, rc2, null, entries2); // serialize language settings to DOM Document doc = XmlUtil.newDocument(); @@ -1237,11 +1237,11 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { LanguageSettingsSerializableProvider loadedProvider = new LanguageSettingsSerializableProvider( elementProvider); - List actual = loadedProvider.getSettingEntries(null, rc1, null); + List actual = loadedProvider.getSettingEntries((IBuildConfiguration) null, rc1, null); assertEquals(entries.get(0), actual.get(0)); assertEquals(entries.size(), actual.size()); - List actual2 = loadedProvider.getSettingEntries(null, rc2, null); + List actual2 = loadedProvider.getSettingEntries((IBuildConfiguration) null, rc2, null); assertEquals(entries2.get(0), actual2.get(0)); assertEquals(entries2.size(), actual2.size()); } @@ -1267,12 +1267,12 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { // store the entries in parent folder List entries = new ArrayList(); entries.add(new CIncludePathEntry("path0", 0)); - provider.setSettingEntries(null, parentFolder, LANG_ID, entries); - provider.setSettingEntries(null, emptySettingsPath, LANG_ID, new ArrayList()); + provider.setSettingEntries((IBuildConfiguration) null, parentFolder, LANG_ID, entries); + provider.setSettingEntries((IBuildConfiguration) null, emptySettingsPath, LANG_ID, new ArrayList()); { // retrieve entries for a parent folder itself - List actual = provider.getSettingEntries(null, parentFolder, LANG_ID); + List actual = provider.getSettingEntries((IBuildConfiguration) null, parentFolder, LANG_ID); assertEquals(entries, actual); assertEquals(entries.size(), actual.size()); } @@ -1280,7 +1280,7 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { { // retrieve entries for a derived resource (in a subfolder) IFile derived = ResourceHelper.createFile(project, "/ParentFolder/Subfolder/resource"); - List actual = provider.getSettingEntries(null, derived, LANG_ID); + List actual = provider.getSettingEntries((IBuildConfiguration) null, derived, LANG_ID); // NOT taken from parent folder assertEquals(null, actual); } @@ -1289,13 +1289,13 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { // retrieve entries for not related resource IFile notRelated = ResourcesPlugin.getWorkspace().getRoot() .getFile(new Path("/AnotherFolder/Subfolder/resource")); - List actual = provider.getSettingEntries(null, notRelated, LANG_ID); + List actual = provider.getSettingEntries((IBuildConfiguration) null, notRelated, LANG_ID); assertEquals(null, actual); } { // test distinction between no settings and empty settings - List actual = provider.getSettingEntries(null, emptySettingsPath, LANG_ID); + List actual = provider.getSettingEntries((IBuildConfiguration) null, emptySettingsPath, LANG_ID); // NOT taken from parent folder and not null assertEquals(0, actual.size()); } @@ -1329,7 +1329,7 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { assertEquals(false, LanguageSettingsManager.isStoringEntriesInProjectArea(provider1)); LanguageSettingsManager.setStoringEntriesInProjectArea(provider1, true); provider1.setSettingEntries(config, MOCK_RC, LANG_ID, sampleEntries_1); - provider1.setSettingEntries(null, null, LANG_ID, sampleEntries_2); + provider1.setSettingEntries((IBuildConfiguration) null, null, LANG_ID, sampleEntries_2); // create another provider with the same data LanguageSettingsSerializableProvider provider2 = new LanguageSettingsSerializableProvider(PROVIDER_1, @@ -1339,7 +1339,7 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { provider2.setProperty(ATTR_PARAMETER, VALUE_PARAMETER); LanguageSettingsManager.setStoringEntriesInProjectArea(provider2, true); provider2.setSettingEntries(config, MOCK_RC, LANG_ID, sampleEntries_1); - provider2.setSettingEntries(null, null, LANG_ID, sampleEntries_2); + provider2.setSettingEntries((IBuildConfiguration) null, null, LANG_ID, sampleEntries_2); // All set now, so they should be equal assertTrue(provider1.hashCode() == provider2.hashCode()); assertTrue(provider1.equals(provider2)); @@ -1409,11 +1409,11 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { // replace default entries List changedEntries = new ArrayList(); changedEntries.add(new CIncludePathEntry("pathX", 1)); - provider2.setSettingEntries(null, null, LANG_ID, changedEntries); + provider2.setSettingEntries((IBuildConfiguration) null, null, LANG_ID, changedEntries); assertFalse(provider1.hashCode() == provider2.hashCode()); assertFalse(provider1.equals(provider2)); // restore provider - provider2.setSettingEntries(null, null, LANG_ID, sampleEntries_2); + provider2.setSettingEntries((IBuildConfiguration) null, null, LANG_ID, sampleEntries_2); assertTrue(provider1.hashCode() == provider2.hashCode()); assertTrue(provider1.equals(provider2)); } @@ -1515,7 +1515,7 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { assertEquals(false, LanguageSettingsManager.isStoringEntriesInProjectArea(provider1)); LanguageSettingsManager.setStoringEntriesInProjectArea(provider1, true); provider1.setSettingEntries(config, MOCK_RC, LANG_ID, sampleEntries_1); - provider1.setSettingEntries(null, null, LANG_ID, sampleEntries_2); + provider1.setSettingEntries((IBuildConfiguration) null, null, LANG_ID, sampleEntries_2); // clone provider MockSerializableProvider providerClone = provider1.clone(); @@ -1545,7 +1545,7 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { assertEquals(sampleEntries_1.get(2), actual1.get(2)); assertEquals(sampleEntries_1.size(), actual1.size()); - List actual2 = providerClone.getSettingEntries(null, null, LANG_ID); + List actual2 = providerClone.getSettingEntries((IBuildConfiguration) null, null, LANG_ID); assertNotSame(sampleEntries_2, actual2); assertEquals(sampleEntries_2.get(0), actual2.get(0)); assertEquals(sampleEntries_2.size(), actual2.size()); @@ -1579,7 +1579,7 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { List entries = new ArrayList(); entries.add(new CIncludePathEntry("path", 1)); - provider1.setSettingEntries(null, null, null, entries); + provider1.setSettingEntries((IBuildConfiguration) null, null, null, entries); // clone provider MockSerializableProvider providerClone = provider1.cloneShallow(); @@ -1591,7 +1591,7 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { LanguageSettingsManager.isStoringEntriesInProjectArea(providerClone)); assertEquals(provider1.getLanguageScope().get(0), providerClone.getLanguageScope().get(0)); - List actual = providerClone.getSettingEntries(null, null, null); + List actual = providerClone.getSettingEntries((IBuildConfiguration) null, null, null); assertNull(actual); } @@ -1631,11 +1631,11 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { // create a provider and set the entries LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1); - provider.setSettingEntries(null, null, null, unsortedEntries); + provider.setSettingEntries((IBuildConfiguration) null, null, null, unsortedEntries); // retrieve and check that language settings got sorted properly int i = 0; - List actual = provider.getSettingEntries(null, null, null); + List actual = provider.getSettingEntries((IBuildConfiguration) null, null, null); assertEquals(includePathEntry1, actual.get(i++)); assertEquals(includePathEntry2, actual.get(i++)); assertEquals(includeFileEntry1, actual.get(i++)); @@ -1690,11 +1690,11 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { // create a provider and set the entries LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1); - provider.setSettingEntries(null, null, null, unsortedEntries); + provider.setSettingEntries((IBuildConfiguration) null, null, null, unsortedEntries); // retrieve and check that language settings got sorted properly int i = 0; - List actual = provider.getSettingEntries(null, null, null); + List actual = provider.getSettingEntries((IBuildConfiguration) null, null, null); assertEquals(includePathEntry1, actual.get(i++)); assertEquals(includePathEntry2, actual.get(i++)); assertEquals(includeFileEntry1, actual.get(i++)); @@ -1734,11 +1734,11 @@ public class LanguageSettingsSerializableProviderTests extends BaseTestCase { // create a provider and set the entries LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1); - provider.setSettingEntries(null, null, null, unsortedEntries); + provider.setSettingEntries((IBuildConfiguration) null, null, null, unsortedEntries); // retrieve and check that language settings got sorted properly int i = 0; - List actual = provider.getSettingEntries(null, null, null); + List actual = provider.getSettingEntries((IBuildConfiguration) null, null, null); assertEquals(macroEntry1, actual.get(i++)); assertEquals(macroEntry2A, actual.get(i++)); assertEquals(macroEntry2B, actual.get(i++)); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsSerializableProvider.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsSerializableProvider.java index 77acb4dbecf..04baad8bc37 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsSerializableProvider.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsSerializableProvider.java @@ -101,7 +101,7 @@ public class LanguageSettingsSerializableProvider extends LanguageSettingsBasePr // note that these entries are intended to be retrieved by // LanguageSettingsManager.getSettingEntriesUpResourceTree() // when the whole resource hierarchy has been traversed up - setSettingEntries(null, null, null, entries); + setSettingEntries((IBuildConfiguration) null, null, null, entries); } } @@ -166,6 +166,15 @@ public class LanguageSettingsSerializableProvider extends LanguageSettingsBasePr fStorage.setSettingEntries(rcProjectPath, languageId, entries); } + /** + * @deprecated Use {@link #setSettingEntries(IBuildConfiguration, IResource, String, List)}. + */ + @Deprecated + public void setSettingEntries(ICConfigurationDescription config, IResource rc, String languageId, + List entries) { + setSettingEntries((IBuildConfiguration) null, rc, languageId, entries); + } + /** * {@inheritDoc}
* Note that this list is unmodifiable. To modify the list copy it, @@ -192,6 +201,16 @@ public class LanguageSettingsSerializableProvider extends LanguageSettingsBasePr return entries; } + /** + * @deprecated Use {@link #getSettingEntries(IBuildConfiguration, IResource, String)}. + */ + @Deprecated + @Override + public List getSettingEntries(ICConfigurationDescription config, IResource rc, + String languageId) { + return getSettingEntries((IBuildConfiguration) null, rc, languageId); + } + /** * Serialize the provider under parent XML element. This is convenience * method not intended to be overridden on purpose. Override