Bug 489563 - API change for Language Settings Providers.

Restored binary compatibility of LanguageSettingsSerializableProvider.

Change-Id: I02c9c7b0cc98a72ef47798a74f7a6ff99e85cf46

3 files changed, 36 insertions, 35 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<ICLanguageSettingEntry> entries2 = new ArrayList<ICLanguageSettingEntry>();
 			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<ICLanguageSettingEntry> entries = new ArrayList<ICLanguageSettingEntry>();
 			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<ICLanguageSettingEntry> entries = provider.getSettingEntries(null, null, null);
+			List<ICLanguageSettingEntry> 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<ICLanguageSettingEntry> entries = provider.getSettingEntries(null, null, null);
+			List<ICLanguageSettingEntry> 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<ICLanguageSettingEntry> noentries = provider.getSettingEntries(null, null, null);
+		List<ICLanguageSettingEntry> 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<ICLanguageSettingEntry> entries = provider.getSettingEntries(null, null, LANGUAGE_ID);
+		List<ICLanguageSettingEntry> 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<ICLanguageSettingEntry> entries = provider.getSettingEntries(null, null, null);
+		List<ICLanguageSettingEntry> 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<String> referencedProjectsNames = new LinkedHashSet<String>(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<ICLanguageSettingEntry> entries = parser.getSettingEntries(null, null, null);
+		List<ICLanguageSettingEntry> 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<ICLanguageSettingEntry> entries = parser.getSettingEntries(null, null, null);
+		List<ICLanguageSettingEntry> entries = parser.getSettingEntries((IBuildConfiguration) null, null, null);
 		assertNull(entries);
 	}
 
@@ -2382,7 +2381,7 @@ public class GCCBuildCommandParserTest extends BaseTestCase {
 		// check populated entries
 		List<ICLanguageSettingEntry> expected = new ArrayList<ICLanguageSettingEntry>();
 		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<ICLanguageSettingEntry> entries = parser.getSettingEntries(null, null, LANG_CPP);
+		List<ICLanguageSettingEntry> 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<ICLanguageSettingEntry> entries = detector.getSettingEntries(null, null, null);
+		List<ICLanguageSettingEntry> 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<ICLanguageSettingEntry> entries = detector.getSettingEntries(null, null, null);
+		List<ICLanguageSettingEntry> 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<ICLanguageSettingEntry> entries = detector.getSettingEntries(null, null, null);
+		List<ICLanguageSettingEntry> 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<ICLanguageSettingEntry> entries = detector.getSettingEntries(null, null, null);
+		List<ICLanguageSettingEntry> 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<ICLanguageSettingEntry> entries = detector.getSettingEntries(null, null, null);
+		List<ICLanguageSettingEntry> 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<ICLanguageSettingEntry> entries = detector.getSettingEntries(null, null, null);
+		List<ICLanguageSettingEntry> 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<ICLanguageSettingEntry> entries = detector.getSettingEntries(null, null, null);
+		List<ICLanguageSettingEntry> 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<ICLanguageSettingEntry> entries = detector.getSettingEntries(null, null, null);
+		List<ICLanguageSettingEntry> 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<ICLanguageSettingEntry> entries = detector.getSettingEntries(null, null, null);
+		List<ICLanguageSettingEntry> 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<ICLanguageSettingEntry> entries = detector.getSettingEntries(null, null, null);
+		List<ICLanguageSettingEntry> 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<ICLanguageSettingEntry> entries = detector.getSettingEntries(null, null, null);
+		List<ICLanguageSettingEntry> 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<ICLanguageSettingEntry> entries = detector.getSettingEntries(null, null, null);
+		List<ICLanguageSettingEntry> 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<ICLanguageSettingEntry> entries = detector.getSettingEntries(null, null, null);
+		List<ICLanguageSettingEntry> 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<ICLanguageSettingEntry> entries = detector.getSettingEntries(null, null, null);
+		List<ICLanguageSettingEntry> 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<ICLanguageSettingEntry> entries = detector.getSettingEntries(null, null, null);
+		List<ICLanguageSettingEntry> entries = detector.getSettingEntries((IBuildConfiguration) null, null, null);
 		assertEquals(new CIncludePathEntry(new Path(windowsLocation), ICSettingEntry.BUILTIN | ICSettingEntry.READONLY), entries.get(0));
 		assertEquals(1, entries.size());
 	}