Move properties to LanguageSettingsBaseProvider, keep "parameter"

attribute in properties

build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/BuiltinSpecsDetectorTest.java

@@ -13,7 +13,9 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.eclipse.cdt.core.ErrorParserManager;
 import org.eclipse.cdt.core.model.CoreModel;
@@ -47,9 +49,11 @@ public class BuiltinSpecsDetectorTest extends BaseTestCase {
 	private static final String PROVIDER_NAME = "provider name";
 	private static final String LANGUAGE_ID = "language.test.id";
 	private static final String CUSTOM_PARAMETER = "customParameter";
+	private static final String CUSTOM_PARAMETER_2 = "customParameter2";
 	private static final String ELEM_TEST = "test";
 
 	// those attributes must match that in AbstractBuiltinSpecsDetector
+	private static final String ATTR_PARAMETER = "parameter"; //$NON-NLS-1$
 	private static final String ATTR_CONSOLE = "console"; //$NON-NLS-1$
 
 	private class MockBuiltinSpecsDetector extends AbstractBuiltinSpecsDetector {
@@ -143,36 +147,46 @@ public class BuiltinSpecsDetectorTest extends BaseTestCase {
 	public void testAbstractBuiltinSpecsDetector_GettersSetters() throws Exception {
 		{
 			// provider configured with null parameters
-			MockBuiltinSpecsDetectorExecutedFlag detector = new MockBuiltinSpecsDetectorExecutedFlag();
+			MockBuiltinSpecsDetectorExecutedFlag provider = new MockBuiltinSpecsDetectorExecutedFlag();
-			detector.configureProvider(PROVIDER_ID, PROVIDER_NAME, null, null, null);
+			provider.configureProvider(PROVIDER_ID, PROVIDER_NAME, null, null, null);
 
-			assertEquals(PROVIDER_ID, detector.getId());
+			assertEquals(PROVIDER_ID, provider.getId());
-			assertEquals(PROVIDER_NAME, detector.getName());
+			assertEquals(PROVIDER_NAME, provider.getName());
-			assertEquals(null, detector.getLanguageScope());
+			assertEquals(null, provider.getLanguageScope());
-			assertEquals(null, detector.getSettingEntries(null, null, null));
+			assertEquals(null, provider.getSettingEntries(null, null, null));
-			assertEquals(null, detector.getCustomParameter());
+			assertEquals(null, provider.getCommand());
-			assertEquals(false, detector.isExecuted());
+			assertEquals(false, provider.isExecuted());
+			assertEquals(false, provider.isConsoleEnabled());
 		}
 
 		{
 			// provider configured with non-null parameters
-			MockBuiltinSpecsDetectorExecutedFlag detector = new MockBuiltinSpecsDetectorExecutedFlag();
+			MockBuiltinSpecsDetectorExecutedFlag provider = new MockBuiltinSpecsDetectorExecutedFlag();
 			List<String> languages = new ArrayList<String>();
 			languages.add(LANGUAGE_ID);
+			Map<String, String> properties = new HashMap<String, String>();
+			properties.put(ATTR_PARAMETER, CUSTOM_PARAMETER);
 			List<ICLanguageSettingEntry> entries = new ArrayList<ICLanguageSettingEntry>();
 			ICLanguageSettingEntry entry = new CMacroEntry("MACRO", "VALUE", ICSettingEntry.BUILTIN | ICSettingEntry.READONLY);
 			entries.add(entry);
 
-			detector.configureProvider(PROVIDER_ID, PROVIDER_NAME, languages, entries, CUSTOM_PARAMETER);
+			provider.configureProvider(PROVIDER_ID, PROVIDER_NAME, languages, entries, properties);
-			assertEquals(PROVIDER_ID, detector.getId());
+			assertEquals(PROVIDER_ID, provider.getId());
-			assertEquals(PROVIDER_NAME, detector.getName());
+			assertEquals(PROVIDER_NAME, provider.getName());
-			assertEquals(languages, detector.getLanguageScope());
+			assertEquals(languages, provider.getLanguageScope());
-			assertEquals(entries, detector.getSettingEntries(null, null, null));
+			assertEquals(entries, provider.getSettingEntries(null, null, null));
-			assertEquals(CUSTOM_PARAMETER, detector.getCustomParameter());
+			assertEquals(CUSTOM_PARAMETER, provider.getCommand());
-			assertEquals(false, detector.isExecuted());
+			assertEquals(false, provider.isConsoleEnabled());
+			assertEquals(false, provider.isExecuted());
 
-			detector.execute();
+			// setters
-			assertEquals(true, detector.isExecuted());
+			provider.setCommand(CUSTOM_PARAMETER_2);
+			assertEquals(CUSTOM_PARAMETER_2, provider.getCommand());
+			provider.setConsoleEnabled(true);
+			assertEquals(true, provider.isConsoleEnabled());
+
+			provider.execute();
+			assertEquals(true, provider.isExecuted());
 		}
 	}
 
@@ -190,7 +204,7 @@ public class BuiltinSpecsDetectorTest extends BaseTestCase {
 		}
 
 		// create instance to compare to
-		MockDetectorCloneable detector = new MockDetectorCloneable();
+		MockDetectorCloneable provider = new MockDetectorCloneable();
 
 		List<String> languages = new ArrayList<String>();
 		languages.add(LANGUAGE_ID);
@@ -199,73 +213,75 @@ public class BuiltinSpecsDetectorTest extends BaseTestCase {
 		entries.add(entry);
 
 		// check clone after initialization
-		MockDetectorCloneable clone0 = detector.clone();
+		MockDetectorCloneable clone0 = provider.clone();
-		assertTrue(detector.equals(clone0));
+		assertTrue(provider.equals(clone0));
 
 		// configure provider
-		detector.configureProvider(PROVIDER_ID, PROVIDER_NAME, languages, entries, CUSTOM_PARAMETER);
+		Map<String, String> properties = new HashMap<String, String>();
-		assertEquals(false, detector.isConsoleEnabled());
+		properties.put(ATTR_PARAMETER, CUSTOM_PARAMETER);
-		detector.setConsoleEnabled(true);
+		provider.configureProvider(PROVIDER_ID, PROVIDER_NAME, languages, entries, properties);
-		detector.execute();
+		assertEquals(false, provider.isConsoleEnabled());
-		assertEquals(true, detector.isExecuted());
+		provider.setConsoleEnabled(true);
-		assertFalse(detector.equals(clone0));
+		provider.execute();
+		assertEquals(true, provider.isExecuted());
+		assertFalse(provider.equals(clone0));
 
 		// check another clone after configuring
 		{
-			MockDetectorCloneable clone = detector.clone();
+			MockDetectorCloneable clone = provider.clone();
-			assertTrue(detector.equals(clone));
+			assertTrue(provider.equals(clone));
 		}
 
 		// check custom parameter
 		{
-			MockDetectorCloneable clone = detector.clone();
+			MockDetectorCloneable clone = provider.clone();
-			clone.setCustomParameter("changed");
+			clone.setCommand("changed");
-			assertFalse(detector.equals(clone));
+			assertFalse(provider.equals(clone));
 		}
 
 		// check language scope
 		{
-			MockDetectorCloneable clone = detector.clone();
+			MockDetectorCloneable clone = provider.clone();
 			clone.setLanguageScope(null);
-			assertFalse(detector.equals(clone));
+			assertFalse(provider.equals(clone));
 		}
 
 		// check console flag
 		{
-			MockDetectorCloneable clone = detector.clone();
+			MockDetectorCloneable clone = provider.clone();
 			boolean isConsoleEnabled = clone.isConsoleEnabled();
 			clone.setConsoleEnabled( ! isConsoleEnabled );
-			assertFalse(detector.equals(clone));
+			assertFalse(provider.equals(clone));
 		}
 
 		// check isExecuted flag
 		{
-			MockDetectorCloneable clone = detector.clone();
+			MockDetectorCloneable clone = provider.clone();
 			assertEquals(true, clone.isExecuted());
 			clone.clear();
 			assertEquals(false, clone.isExecuted());
-			assertFalse(detector.equals(clone));
+			assertFalse(provider.equals(clone));
 		}
 
 		// check entries
 		{
-			MockDetectorCloneable clone = detector.clone();
+			MockDetectorCloneable clone = provider.clone();
 			clone.setSettingEntries(null, null, null, null);
-			assertFalse(detector.equals(clone));
+			assertFalse(provider.equals(clone));
 		}
 
 		// check cloneShallow()
 		{
-			MockDetectorCloneable detector2 = detector.clone();
+			MockDetectorCloneable provider2 = provider.clone();
-			MockDetectorCloneable clone = detector2.cloneShallow();
+			MockDetectorCloneable clone = provider2.cloneShallow();
 			assertEquals(false, clone.isExecuted());
-			assertFalse(detector2.equals(clone));
+			assertFalse(provider2.equals(clone));
 
-			detector2.setSettingEntries(null, null, null, null);
+			provider2.setSettingEntries(null, null, null, null);
-			assertFalse(detector2.equals(clone));
+			assertFalse(provider2.equals(clone));
 
 			clone.execute();
-			assertTrue(detector2.equals(clone));
+			assertTrue(provider2.equals(clone));
 		}
 	}
 
@@ -278,54 +294,54 @@ public class BuiltinSpecsDetectorTest extends BaseTestCase {
 			Element rootElement = XmlUtil.appendElement(doc, ELEM_TEST);
 
 			// load it to new provider
-			MockBuiltinSpecsDetectorExecutedFlag detector = new MockBuiltinSpecsDetectorExecutedFlag();
+			MockBuiltinSpecsDetectorExecutedFlag provider = new MockBuiltinSpecsDetectorExecutedFlag();
-			detector.load(rootElement);
+			provider.load(rootElement);
-			assertEquals(false, detector.isConsoleEnabled());
+			assertEquals(false, provider.isConsoleEnabled());
 		}
 
 		Element elementProvider;
 		{
 			// define mock detector
-			MockBuiltinSpecsDetectorExecutedFlag detector = new MockBuiltinSpecsDetectorExecutedFlag();
+			MockBuiltinSpecsDetectorExecutedFlag provider = new MockBuiltinSpecsDetectorExecutedFlag();
-			assertEquals(false, detector.isConsoleEnabled());
+			assertEquals(false, provider.isConsoleEnabled());
 
 			// redefine the settings
-			detector.setConsoleEnabled(true);
+			provider.setConsoleEnabled(true);
-			assertEquals(true, detector.isConsoleEnabled());
+			assertEquals(true, provider.isConsoleEnabled());
 
 			// serialize in XML
 			Document doc = XmlUtil.newDocument();
 			Element rootElement = XmlUtil.appendElement(doc, ELEM_TEST);
-			elementProvider = detector.serialize(rootElement);
+			elementProvider = provider.serialize(rootElement);
 			String xmlString = XmlUtil.toString(doc);
 
 			assertTrue(xmlString.contains(ATTR_CONSOLE));
 		}
 		{
 			// create another instance of the provider
-			MockBuiltinSpecsDetectorExecutedFlag detector = new MockBuiltinSpecsDetectorExecutedFlag();
+			MockBuiltinSpecsDetectorExecutedFlag provider = new MockBuiltinSpecsDetectorExecutedFlag();
-			assertEquals(false, detector.isConsoleEnabled());
+			assertEquals(false, provider.isConsoleEnabled());
 
 			// load element
-			detector.load(elementProvider);
+			provider.load(elementProvider);
-			assertEquals(true, detector.isConsoleEnabled());
+			assertEquals(true, provider.isConsoleEnabled());
 		}
 	}
 
 	public void testAbstractBuiltinSpecsDetector_Nulls() throws Exception {
 		{
 			// test AbstractBuiltinSpecsDetector.processLine(...) flow
-			MockBuiltinSpecsDetector detector = new MockBuiltinSpecsDetector();
+			MockBuiltinSpecsDetector provider = new MockBuiltinSpecsDetector();
-			detector.startup(null);
+			provider.startup(null);
-			detector.startupForLanguage(null);
+			provider.startupForLanguage(null);
-			detector.processLine(null, null);
+			provider.processLine(null, null);
-			detector.shutdownForLanguage();
+			provider.shutdownForLanguage();
-			detector.shutdown();
+			provider.shutdown();
 		}
 		{
 			// test AbstractBuiltinSpecsDetector.processLine(...) flow
-			MockConsoleBuiltinSpecsDetector detector = new MockConsoleBuiltinSpecsDetector();
+			MockConsoleBuiltinSpecsDetector provider = new MockConsoleBuiltinSpecsDetector();
-			detector.runForEachLanguage(null, null, null, null);
+			provider.runForEachLanguage(null, null, null, null);
 		}
 	}
 
@@ -336,28 +352,28 @@ public class BuiltinSpecsDetectorTest extends BaseTestCase {
 		ICConfigurationDescription[] cfgDescriptions = getConfigurationDescriptions(project);
 		ICConfigurationDescription cfgDescription = cfgDescriptions[0];
 
-		MockConsoleBuiltinSpecsDetector detector = new MockConsoleBuiltinSpecsDetector();
+		MockConsoleBuiltinSpecsDetector provider = new MockConsoleBuiltinSpecsDetector();
-		detector.setLanguageScope(new ArrayList<String>() {{add(LANGUAGE_ID);}});
+		provider.setLanguageScope(new ArrayList<String>() {{add(LANGUAGE_ID);}});
 
-		detector.runForEachLanguage(cfgDescription, null, null, null);
+		provider.runForEachLanguage(cfgDescription, null, null, null);
-		assertFalse(detector.isEmpty());
+		assertFalse(provider.isEmpty());
 
-		List<ICLanguageSettingEntry> noentries = detector.getSettingEntries(null, null, null);
+		List<ICLanguageSettingEntry> noentries = provider.getSettingEntries(null, null, null);
 		assertNull(noentries);
 
-		List<ICLanguageSettingEntry> entries = detector.getSettingEntries(cfgDescription, null, LANGUAGE_ID);
+		List<ICLanguageSettingEntry> entries = provider.getSettingEntries(cfgDescription, null, LANGUAGE_ID);
 		ICLanguageSettingEntry expected = new CMacroEntry("MACRO", "VALUE", ICSettingEntry.BUILTIN | ICSettingEntry.READONLY);
 		assertEquals(expected, entries.get(0));
 	}
 
 	public void testAbstractBuiltinSpecsDetector_RunGlobal() throws Exception {
-		MockConsoleBuiltinSpecsDetector detector = new MockConsoleBuiltinSpecsDetector();
+		MockConsoleBuiltinSpecsDetector provider = new MockConsoleBuiltinSpecsDetector();
-		detector.setLanguageScope(new ArrayList<String>() {{add(LANGUAGE_ID);}});
+		provider.setLanguageScope(new ArrayList<String>() {{add(LANGUAGE_ID);}});
 
-		detector.runForEachLanguage(null, null, null, null);
+		provider.runForEachLanguage(null, null, null, null);
-		assertFalse(detector.isEmpty());
+		assertFalse(provider.isEmpty());
 
-		List<ICLanguageSettingEntry> entries = detector.getSettingEntries(null, null, LANGUAGE_ID);
+		List<ICLanguageSettingEntry> entries = provider.getSettingEntries(null, null, LANGUAGE_ID);
 		ICLanguageSettingEntry expected = new CMacroEntry("MACRO", "VALUE", ICSettingEntry.BUILTIN | ICSettingEntry.READONLY);
 		assertEquals(expected, entries.get(0));
 	}
@@ -378,7 +394,7 @@ public class BuiltinSpecsDetectorTest extends BaseTestCase {
 		final CLibraryFileEntry libraryFile_2 = new CLibraryFileEntry("lib_2.a", ICSettingEntry.BUILTIN | ICSettingEntry.READONLY);
 
 		// Define mock detector adding unorganized entries
-		MockBuiltinSpecsDetector detector = new MockBuiltinSpecsDetector() {
+		MockBuiltinSpecsDetector provider = new MockBuiltinSpecsDetector() {
 			@Override
 			public boolean processLine(String line, ErrorParserManager epm) {
 				detectedSettingEntries.add(libraryFile_1);
@@ -399,14 +415,14 @@ public class BuiltinSpecsDetectorTest extends BaseTestCase {
 		};
 
 		// run specs detector
-		detector.startup(null);
+		provider.startup(null);
-		detector.startupForLanguage(null);
+		provider.startupForLanguage(null);
-		detector.processLine("", null);
+		provider.processLine("", null);
-		detector.shutdownForLanguage();
+		provider.shutdownForLanguage();
-		detector.shutdown();
+		provider.shutdown();
 
 		// compare benchmarks, expected well-sorted
-		List<ICLanguageSettingEntry> entries = detector.getSettingEntries(null, null, null);
+		List<ICLanguageSettingEntry> entries = provider.getSettingEntries(null, null, null);
 
 		int i=0;
 		assertEquals(includePath_1, entries.get(i++));

build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/GCCBuildCommandParserTest.java

@@ -58,10 +58,16 @@ public class GCCBuildCommandParserTest extends BaseTestCase {
 	// ID of the parser taken from the extension point
 	private static final String GCC_BUILD_COMMAND_PARSER_EXT = "org.eclipse.cdt.make.core.build.command.parser.gcc"; //$NON-NLS-1$
 
+	private static final String PROVIDER_ID = "provider.id";
+	private static final String PROVIDER_NAME = "provider name";
+	private static final String LANGUAGE_ID = "language.test.id";
+	private static final String CUSTOM_PARAMETER = "customParameter";
+	private static final String CUSTOM_PARAMETER_2 = "customParameter2";
 	private static final String ELEM_TEST = "test";
 	private static final String LANG_CPP = GPPLanguage.ID;
 
-	// those attributes must match that in AbstractBuiltinSpecsDetector
+	// those attributes must match that in AbstractBuildCommandParser
+	private static final String ATTR_PARAMETER = "parameter"; //$NON-NLS-1$
 	private static final String ATTR_EXPAND_RELATIVE_PATHS = "expand-relative-paths"; //$NON-NLS-1$
 
 	private class MockBuildCommandParser extends AbstractBuildCommandParser  implements Cloneable {
@@ -159,6 +165,43 @@ public class GCCBuildCommandParserTest extends BaseTestCase {
 	}
 
 
+	public void testAbstractBuildCommandParser_GettersSetters() throws Exception {
+		{
+			// provider configured with null parameters
+			MockBuildCommandParser provider = new MockBuildCommandParser();
+			provider.configureProvider(PROVIDER_ID, PROVIDER_NAME, null, null, null);
+
+			assertEquals(PROVIDER_ID, provider.getId());
+			assertEquals(PROVIDER_NAME, provider.getName());
+			assertEquals(null, provider.getLanguageScope());
+			assertEquals(null, provider.getSettingEntries(null, null, null));
+			assertEquals(null, provider.getCompilerPattern());
+		}
+
+		{
+			// provider configured with non-null parameters
+			MockBuildCommandParser provider = new MockBuildCommandParser();
+			List<String> languages = new ArrayList<String>();
+			languages.add(LANGUAGE_ID);
+			Map<String, String> properties = new HashMap<String, String>();
+			properties.put(ATTR_PARAMETER, CUSTOM_PARAMETER);
+			List<ICLanguageSettingEntry> entries = new ArrayList<ICLanguageSettingEntry>();
+			ICLanguageSettingEntry entry = new CMacroEntry("MACRO", "VALUE", ICSettingEntry.BUILTIN | ICSettingEntry.READONLY);
+			entries.add(entry);
+
+			provider.configureProvider(PROVIDER_ID, PROVIDER_NAME, languages, entries, properties);
+			assertEquals(PROVIDER_ID, provider.getId());
+			assertEquals(PROVIDER_NAME, provider.getName());
+			assertEquals(languages, provider.getLanguageScope());
+			assertEquals(entries, provider.getSettingEntries(null, null, null));
+			assertEquals(CUSTOM_PARAMETER, provider.getCompilerPattern());
+
+			// setters
+			provider.setCompilerPattern(CUSTOM_PARAMETER_2);
+			assertEquals(CUSTOM_PARAMETER_2, provider.getCompilerPattern());
+		}
+	}
+
 	public void testAbstractBuildCommandParser_CloneAndEquals() throws Exception {
 		// create instance to compare to
 		MockBuildCommandParser parser = new MockBuildCommandParser();

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/scannerconfig/AbstractBuildCommandParser.java

@@ -45,8 +45,8 @@ import org.eclipse.core.runtime.jobs.Job;
  */
 public abstract class AbstractBuildCommandParser extends AbstractLanguageSettingsOutputScanner
 		implements ICConsoleParser, IErrorParser {
-
 	public static final Object JOB_FAMILY_BUILD_COMMAND_PARSER = "org.eclipse.cdt.make.core.scannerconfig.AbstractBuildCommandParser";
+	private static final String ATTR_PARAMETER = "parameter"; //$NON-NLS-1$
 
 	private static final String LEADING_PATH_PATTERN = "\\S+[/\\\\]"; //$NON-NLS-1$
 	private static final Pattern OPTIONS_PATTERN = Pattern.compile("-[^\\s\"']*(\\s*((\".*?\")|('.*?')|([^-\\s][^\\s]+)))?"); //$NON-NLS-1$
@@ -63,22 +63,43 @@ public abstract class AbstractBuildCommandParser extends AbstractLanguageSetting
 	private static final int FILE_GROUP = 2;
 
 
+	/**
+	 * The compiler command pattern without specifying compiler options.
+	 * The options are intended to be handled with option parsers,
+	 * see {@link #getOptionParsers()}.
+	 * This is regular expression pattern.
+	 *
+	 * @return the compiler command pattern.
+	 */
+	public String getCompilerPattern() {
+		return getProperty(ATTR_PARAMETER);
+	}
+
+	/**
+	 * Set compiler command pattern for the provider. See {@link #getCompilerPattern()}.
+	 * @param commandPattern - value of the command pattern to set.
+	 *    This is regular expression pattern.
+	 */
+	public void setCompilerPattern(String commandPattern) {
+		setProperty(ATTR_PARAMETER, commandPattern);
+	}
+
 	@SuppressWarnings("nls")
-	private String getCompilerCommandPattern() {
+	private String getCompilerPatternExtended() {
-		String parameter = getCustomParameter();
+		String compilerPattern = getCompilerPattern();
-		return "\\s*\"?("+LEADING_PATH_PATTERN+")?(" + parameter + ")\"?";
+		return "\\s*\"?("+LEADING_PATH_PATTERN+")?(" + compilerPattern + ")\"?";
 	}
 
 	private int adjustFileGroup() {
-		return countGroups(getCompilerCommandPattern()) + FILE_GROUP;
+		return countGroups(getCompilerPatternExtended()) + FILE_GROUP;
 	}
 
 	private String makePattern(String template) {
 		@SuppressWarnings("nls")
 		String pattern = template
-				.replace("${COMPILER_PATTERN}", getCompilerCommandPattern())
+				.replace("${COMPILER_PATTERN}", getCompilerPatternExtended())
 				.replace("${EXTENSIONS_PATTERN}", getPatternFileExtensions())
-				.replace("${COMPILER_GROUPS+1}", new Integer(countGroups(getCompilerCommandPattern()) + 1).toString());
+				.replace("${COMPILER_GROUPS+1}", new Integer(countGroups(getCompilerPatternExtended()) + 1).toString());
 		return pattern;
 	}
 

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/scannerconfig/AbstractBuiltinSpecsDetector.java

@@ -80,6 +80,7 @@ public abstract class AbstractBuiltinSpecsDetector extends AbstractLanguageSetti
 	private static final String PLUGIN_CDT_MAKE_UI_ID = "org.eclipse.cdt.make.ui"; //$NON-NLS-1$
 	private static final String GMAKE_ERROR_PARSER_ID = "org.eclipse.cdt.core.GmakeErrorParser"; //$NON-NLS-1$
 	private static final String PATH_ENV = "PATH"; //$NON-NLS-1$
+	private static final String ATTR_PARAMETER = "parameter"; //$NON-NLS-1$
 	private static final String ATTR_CONSOLE = "console"; //$NON-NLS-1$
 
 	protected static final String COMPILER_MACRO = "${COMMAND}"; //$NON-NLS-1$
@@ -182,6 +183,30 @@ public abstract class AbstractBuiltinSpecsDetector extends AbstractLanguageSetti
 		}
 	}
 
+	/**
+	 * The command to run. Some macros could be specified in there:
+	 * <ul>
+	 * <b>${COMMAND}</b> - compiler command taken from the toolchain.<br>
+	 * <b>${INPUTS}</b> - path to spec file which will be placed in workspace area.<br>
+	 * <b>${EXT}</b> - file extension calculated from language ID.
+	 * </ul>
+	 * The parameter could be taken from the extension
+	 * in {@code plugin.xml} or from property file.
+	 *
+	 * @return the command to run.
+	 */
+	public String getCommand() {
+		return getProperty(ATTR_PARAMETER);
+	}
+
+	/**
+	 * Set custom command for the provider. See {@link #getCommand()}.
+	 * @param command - value of custom command to set.
+	 */
+	public void setCommand(String command) {
+		setProperty(ATTR_PARAMETER, command);
+	}
+
 	public void setConsoleEnabled(boolean enable) {
 		isConsoleEnabled = enable;
 	}
@@ -191,7 +216,7 @@ public abstract class AbstractBuiltinSpecsDetector extends AbstractLanguageSetti
 	}
 
 	protected String resolveCommand(String languageId) throws CoreException {
-		String cmd = getCustomParameter();
+		String cmd = getCommand();
 		if (cmd!=null && (cmd.contains(COMPILER_MACRO) || cmd.contains(SPEC_FILE_MACRO) || cmd.contains(SPEC_EXT_MACRO))) {
 			if (cmd.contains(COMPILER_MACRO)) {
 				String compiler = getCompilerCommand(languageId);

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/GCCBuildCommandParserOptionPage.java

@@ -88,8 +88,8 @@ public final class GCCBuildCommandParserOptionPage extends AbstractLanguageSetti
 
 		{
 			inputCommand = ControlFactory.createTextField(composite, SWT.SINGLE | SWT.BORDER);
-			String customParameter = provider.getCustomParameter();
+			String compilerPattern = provider.getCompilerPattern();
-			inputCommand.setText(customParameter!=null ? customParameter : "");
+			inputCommand.setText(compilerPattern!=null ? compilerPattern : "");
 
 			GridData gd = new GridData();
 			gd.horizontalSpan = 1;
@@ -103,9 +103,9 @@ public final class GCCBuildCommandParserOptionPage extends AbstractLanguageSetti
 				public void modifyText(ModifyEvent e) {
 					String text = inputCommand.getText();
 					AbstractBuildCommandParser provider = getRawProvider();
-					if (!text.equals(provider.getCustomParameter())) {
+					if (!text.equals(provider.getCompilerPattern())) {
 						AbstractBuildCommandParser selectedProvider = getWorkingCopy(providerId);
-						selectedProvider.setCustomParameter(text);
+						selectedProvider.setCompilerPattern(text);
 						providerTab.refreshItem(selectedProvider);
 					}
 				}

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/scannerconfig/BuiltinSpecsDetectorOptionPage.java

@@ -84,17 +84,17 @@ public final class BuiltinSpecsDetectorOptionPage extends AbstractLanguageSettin
 
 		{
 			inputCommand = ControlFactory.createTextField(composite, SWT.SINGLE | SWT.BORDER);
-			String customParameter = provider.getCustomParameter();
+			String command = provider.getCommand();
-			inputCommand.setText(customParameter!=null ? customParameter : "");
+			inputCommand.setText(command!=null ? command : "");
 			inputCommand.setEnabled(fEditable);
 			inputCommand.addModifyListener(new ModifyListener() {
 				@Override
 				public void modifyText(ModifyEvent e) {
 					String text = inputCommand.getText();
 					AbstractBuiltinSpecsDetector provider = getRawProvider();
-					if (!text.equals(provider.getCustomParameter())) {
+					if (!text.equals(provider.getCommand())) {
 						AbstractBuiltinSpecsDetector selectedProvider = getWorkingCopy(providerId);
-						selectedProvider.setCustomParameter(text);
+						selectedProvider.setCommand(text);
 						providerTab.refreshItem(selectedProvider);
 					}
 				}

build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/build/core/scannerconfig/tests/GCCBuiltinSpecsDetectorTest.java

@@ -88,7 +88,7 @@ public class GCCBuiltinSpecsDetectorTest extends BaseTestCase {
 		{
 			MockGCCBuiltinSpecsDetectorLocal detector = new MockGCCBuiltinSpecsDetectorLocal();
 			detector.setLanguageScope(new ArrayList<String>() {{add(LANGUAGE_ID_C);}});
-			detector.setCustomParameter("${COMMAND} -E -P -v -dD ${INPUTS}");
+			detector.setCommand("${COMMAND} -E -P -v -dD ${INPUTS}");
 
 			String resolvedCommand = detector.resolveCommand(LANGUAGE_ID_C);
 			assertTrue(resolvedCommand.startsWith("gcc -E -P -v -dD "));
@@ -97,7 +97,7 @@ public class GCCBuiltinSpecsDetectorTest extends BaseTestCase {
 		{
 			MockGCCBuiltinSpecsDetectorLocal detector = new MockGCCBuiltinSpecsDetectorLocal();
 			detector.setLanguageScope(new ArrayList<String>() {{add(LANGUAGE_ID_C);}});
-			detector.setCustomParameter("${COMMAND} -E -P -v -dD file.${EXT}");
+			detector.setCommand("${COMMAND} -E -P -v -dD file.${EXT}");
 
 			String resolvedCommand = detector.resolveCommand(LANGUAGE_ID_C);
 			assertTrue(resolvedCommand.startsWith("gcc -E -P -v -dD "));

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

@@ -39,6 +39,7 @@ public class LanguageSettingsExtensionsTests extends BaseTestCase {
 	/*package*/ static final String EXTENSION_BASE_PROVIDER_NAME = "Test Plugin Mock Language Settings Base Provider";
 	/*package*/ static final String EXTENSION_BASE_PROVIDER_LANG_ID = "org.eclipse.cdt.core.tests.language.id";
 	/*package*/ static final String EXTENSION_BASE_PROVIDER_PARAMETER = "custom parameter";
+	/*package*/ static final String EXTENSION_BASE_PROVIDER_ATTR_PARAMETER = "parameter";
 	/*package*/ static final String EXTENSION_CUSTOM_PROVIDER_ID = "org.eclipse.cdt.core.tests.custom.language.settings.provider";
 	/*package*/ static final String EXTENSION_CUSTOM_PROVIDER_NAME = "Test Plugin Mock Language Settings Provider";
 	/*package*/ static final String EXTENSION_BASE_SUBCLASS_PROVIDER_ID = "org.eclipse.cdt.core.tests.language.settings.base.provider.subclass";
@@ -122,7 +123,7 @@ public class LanguageSettingsExtensionsTests extends BaseTestCase {
 		LanguageSettingsBaseProvider provider = (LanguageSettingsBaseProvider)rawProvider;
 		assertEquals(EXTENSION_BASE_PROVIDER_ID, provider.getId());
 		assertEquals(EXTENSION_BASE_PROVIDER_NAME, provider.getName());
-		assertEquals(EXTENSION_BASE_PROVIDER_PARAMETER, provider.getCustomParameter());
+		assertEquals(EXTENSION_BASE_PROVIDER_PARAMETER, provider.getProperty(EXTENSION_BASE_PROVIDER_ATTR_PARAMETER));
 
 		// attempt to get entries for wrong language
 		assertNull(provider.getSettingEntries(null, FILE_0, LANG_ID));
@@ -263,7 +264,7 @@ public class LanguageSettingsExtensionsTests extends BaseTestCase {
 		LanguageSettingsSerializableProvider provider = (LanguageSettingsSerializableProvider) rawProvider;
 
 		assertEquals(null, provider.getLanguageScope());
-		assertEquals("", provider.getCustomParameter());
+		assertEquals("", provider.getProperty(EXTENSION_BASE_PROVIDER_ATTR_PARAMETER));
 
 		List<ICLanguageSettingEntry> expected = new ArrayList<ICLanguageSettingEntry>();
 		expected.add(new CMacroEntry("MACRO", "value", 0));

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

@@ -54,8 +54,7 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase {
 	private static final String PROVIDER_2 = "test.provider.2.id";
 	private static final String PROVIDER_NAME_0 = "test.provider.0.name";
 	private static final String PROVIDER_NAME_2 = "test.provider.2.name";
-	private static final String PROVIDER_ID_WSP = "test.provider.workspace.id";
+	private static final String ATTR_PARAMETER = "parameter";
-	private static final String PROVIDER_NAME_WSP = "test.provider.workspace.name";
 	private static final String CUSTOM_PARAMETER = "custom parameter";
 	private static final String ELEM_TEST = "test";
 
@@ -349,8 +348,8 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase {
 			assertEquals(EXTENSION_SERIALIZABLE_PROVIDER_ID, rawProvider.getId());
 
 			// customize provider
-			rawProvider.setCustomParameter(CUSTOM_PARAMETER);
+			rawProvider.setProperty(ATTR_PARAMETER, CUSTOM_PARAMETER);
-			assertEquals(CUSTOM_PARAMETER, rawProvider.getCustomParameter());
+			assertEquals(CUSTOM_PARAMETER, rawProvider.getProperty(ATTR_PARAMETER));
 		}
 		{
 			// save workspace provider (as opposed to raw provider)
@@ -363,7 +362,7 @@ public class LanguageSettingsPersistenceProjectTests extends BaseTestCase {
 			// check that it has not cleared
 			ILanguageSettingsProvider provider = LanguageSettingsManager.getWorkspaceProvider(EXTENSION_SERIALIZABLE_PROVIDER_ID);
 			LanguageSettingsSerializableProvider rawProvider = (LanguageSettingsSerializableProvider) LanguageSettingsManager.getRawProvider(provider);
-			assertEquals(CUSTOM_PARAMETER, rawProvider.getCustomParameter());
+			assertEquals(CUSTOM_PARAMETER, rawProvider.getProperty(ATTR_PARAMETER));
 		}
 	}
 

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

@@ -54,7 +54,8 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
 	private static final String PROVIDER_NAME_NULL = "test.provider.null.name";
 	private static final String PROVIDER_NAME_1 = "test.provider.1.name";
 	private static final String PROVIDER_NAME_2 = "test.provider.2.name";
-	private static final String CUSTOM_PARAMETER = "custom.parameter";
+	private static final String ATTR_PARAMETER = "parameter";
+	private static final String VALUE_PARAMETER = "custom.parameter";
 	private static final String ATTR_STORE_ENTRIES = "store-entries";
 	private static final String VALUE_PROJECT = "project";
 	private static final String ELEM_TEST = "test";
@@ -113,14 +114,8 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
 		assertEquals(PROVIDER_2, mockProvider.getId());
 		mockProvider.setName(PROVIDER_NAME_2);
 		assertEquals(PROVIDER_NAME_2, mockProvider.getName());
-		mockProvider.setCustomParameter(CUSTOM_PARAMETER);
+		mockProvider.setProperty(ATTR_PARAMETER, VALUE_PARAMETER);
-		assertEquals(CUSTOM_PARAMETER, mockProvider.getCustomParameter());
+		assertEquals(VALUE_PARAMETER, mockProvider.getProperty(ATTR_PARAMETER));
-
-		assertEquals(false, LanguageSettingsManager.isStoringEntriesInProjectArea(mockProvider));
-		LanguageSettingsManager.setStoringEntriesInProjectArea(mockProvider, true);
-		assertEquals(true, LanguageSettingsManager.isStoringEntriesInProjectArea(mockProvider));
-		LanguageSettingsManager.setStoringEntriesInProjectArea(mockProvider, false);
-		assertEquals(false, LanguageSettingsManager.isStoringEntriesInProjectArea(mockProvider));
 
 		mockProvider.setLanguageScope(languages);
 		assertEquals(languages, mockProvider.getLanguageScope());
@@ -138,6 +133,19 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
 		assertTrue(mockProvider.isEmpty());
 	}
 
+	/**
+	 */
+	public void testProvider_SetStoringEntriesInProjectArea() throws Exception {
+		// create a provider
+		LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
+
+		assertEquals(false, LanguageSettingsManager.isStoringEntriesInProjectArea(provider));
+		LanguageSettingsManager.setStoringEntriesInProjectArea(provider, true);
+		assertEquals(true, LanguageSettingsManager.isStoringEntriesInProjectArea(provider));
+		LanguageSettingsManager.setStoringEntriesInProjectArea(provider, false);
+		assertEquals(false, LanguageSettingsManager.isStoringEntriesInProjectArea(provider));
+	}
+
 	/**
 	 */
 	public void testProvider_RegularDOM() throws Exception {
@@ -146,7 +154,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
 			// create customized provider
 			LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
 			LanguageSettingsManager.setStoringEntriesInProjectArea(provider, true);
-			provider.setCustomParameter(CUSTOM_PARAMETER);
+			provider.setProperty(ATTR_PARAMETER, VALUE_PARAMETER);
 
 			List<String> languageScope = new ArrayList<String>();
 			languageScope.add(LANG_ID);
@@ -164,7 +172,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
 			String xmlString = XmlUtil.toString(doc);
 			assertTrue(xmlString.contains(PROVIDER_1));
 			assertTrue(xmlString.contains(PROVIDER_NAME_1));
-			assertTrue(xmlString.contains(CUSTOM_PARAMETER));
+			assertTrue(xmlString.contains(VALUE_PARAMETER));
 			assertTrue(xmlString.contains(LANG_ID));
 			assertTrue(xmlString.contains("path0"));
 		}
@@ -173,7 +181,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
 			LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(elementProvider);
 			assertEquals(PROVIDER_1, provider.getId());
 			assertEquals(true, LanguageSettingsManager.isStoringEntriesInProjectArea(provider));
-			assertEquals(CUSTOM_PARAMETER, provider.getCustomParameter());
+			assertEquals(VALUE_PARAMETER, provider.getProperty(ATTR_PARAMETER));
 			assertNotNull(provider.getLanguageScope());
 			assertTrue(provider.getLanguageScope().size()>0);
 			assertEquals(LANG_ID, provider.getLanguageScope().get(0));
@@ -193,7 +201,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
 			// create customized provider
 			LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
 			LanguageSettingsManager.setStoringEntriesInProjectArea(provider, true);
-			provider.setCustomParameter(CUSTOM_PARAMETER);
+			provider.setProperty(ATTR_PARAMETER, VALUE_PARAMETER);
 
 			List<String> languageScope = new ArrayList<String>();
 			languageScope.add(LANG_ID);
@@ -211,7 +219,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
 			String xmlString = XmlUtil.toString(doc);
 			assertTrue(xmlString.contains(PROVIDER_1));
 			assertTrue(xmlString.contains(PROVIDER_NAME_1));
-			assertTrue(xmlString.contains(CUSTOM_PARAMETER));
+			assertTrue(xmlString.contains(VALUE_PARAMETER));
 			assertTrue(xmlString.contains(LANG_ID));
 			// no entries
 			assertFalse(xmlString.contains("path0"));
@@ -222,7 +230,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
 			provider.loadAttributes(elementProvider);
 			assertEquals(PROVIDER_1, provider.getId());
 			assertEquals(true, LanguageSettingsManager.isStoringEntriesInProjectArea(provider));
-			assertEquals(CUSTOM_PARAMETER, provider.getCustomParameter());
+			assertEquals(VALUE_PARAMETER, provider.getProperty(ATTR_PARAMETER));
 			assertNotNull(provider.getLanguageScope());
 			assertTrue(provider.getLanguageScope().size()>0);
 			assertEquals(LANG_ID, provider.getLanguageScope().get(0));
@@ -240,7 +248,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
 			// create customized provider
 			LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
 			LanguageSettingsManager.setStoringEntriesInProjectArea(provider, true);
-			provider.setCustomParameter(CUSTOM_PARAMETER);
+			provider.setProperty(ATTR_PARAMETER, VALUE_PARAMETER);
 
 			List<String> languageScope = new ArrayList<String>();
 			languageScope.add(LANG_ID);
@@ -259,7 +267,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
 			// no attributes
 			assertFalse(xmlString.contains(PROVIDER_1));
 			assertFalse(xmlString.contains(PROVIDER_NAME_1));
-			assertFalse(xmlString.contains(CUSTOM_PARAMETER));
+			assertFalse(xmlString.contains(VALUE_PARAMETER));
 			assertFalse(xmlString.contains(LANG_ID));
 			// entries should be present
 			assertTrue(xmlString.contains("path0"));
@@ -274,7 +282,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
 			assertFalse(PROVIDER_1.equals(provider.getId()));
 			assertFalse(PROVIDER_NAME_1.equals(provider.getName()));
 			assertFalse(true==LanguageSettingsManager.isStoringEntriesInProjectArea(provider));
-			assertFalse(CUSTOM_PARAMETER.equals(provider.getCustomParameter()));
+			assertFalse(VALUE_PARAMETER.equals(provider.getProperty(ATTR_PARAMETER)));
 			assertNull(provider.getLanguageScope());
 			// entries should be loaded
 			List<ICLanguageSettingEntry> entries = provider.getSettingEntries(null, null, null);
@@ -318,19 +326,19 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
 		{
 			// create provider with custom parameter
 			LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
-			provider.setCustomParameter(CUSTOM_PARAMETER);
+			provider.setProperty(ATTR_PARAMETER, VALUE_PARAMETER);
-			assertEquals(CUSTOM_PARAMETER, provider.getCustomParameter());
+			assertEquals(VALUE_PARAMETER, provider.getProperty(ATTR_PARAMETER));
 
 			Document doc = XmlUtil.newDocument();
 			Element rootElement = XmlUtil.appendElement(doc, ELEM_TEST);
 			elementProvider = provider.serialize(rootElement);
 			String xmlString = XmlUtil.toString(doc);
-			assertTrue(xmlString.contains(CUSTOM_PARAMETER));
+			assertTrue(xmlString.contains(VALUE_PARAMETER));
 		}
 		{
 			// re-load and check custom parameter of the newly loaded provider
 			LanguageSettingsSerializableProvider provider = new LanguageSettingsSerializableProvider(elementProvider);
-			assertEquals(CUSTOM_PARAMETER, provider.getCustomParameter());
+			assertEquals(VALUE_PARAMETER, provider.getProperty(ATTR_PARAMETER));
 		}
 	}
 
@@ -1175,7 +1183,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
 		// create a model provider
 		LanguageSettingsSerializableProvider provider1 = new LanguageSettingsSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
 		provider1.setLanguageScope(sampleLanguages);
-		provider1.setCustomParameter(CUSTOM_PARAMETER);
+		provider1.setProperty(ATTR_PARAMETER, VALUE_PARAMETER);
 		assertEquals(false, LanguageSettingsManager.isStoringEntriesInProjectArea(provider1));
 		LanguageSettingsManager.setStoringEntriesInProjectArea(provider1, true);
 		provider1.setSettingEntries(MOCK_CFG, MOCK_RC, LANG_ID, sampleEntries_1);
@@ -1199,7 +1207,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
 			assertFalse(provider1.equals(provider2));
 			assertFalse(provider1.hashCode()==provider2.hashCode());
 
-			provider2.setCustomParameter(CUSTOM_PARAMETER);
+			provider2.setProperty(ATTR_PARAMETER, VALUE_PARAMETER);
 			assertFalse(provider1.equals(provider2));
 			assertFalse(provider1.hashCode()==provider2.hashCode());
 
@@ -1252,7 +1260,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
 		}
 		MockSerializableProvider provider1 = new MockSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
 		provider1.setLanguageScope(sampleLanguages);
-		provider1.setCustomParameter(CUSTOM_PARAMETER);
+		provider1.setProperty(ATTR_PARAMETER, VALUE_PARAMETER);
 		assertEquals(false, LanguageSettingsManager.isStoringEntriesInProjectArea(provider1));
 		LanguageSettingsManager.setStoringEntriesInProjectArea(provider1, true);
 		provider1.setSettingEntries(MOCK_CFG, MOCK_RC, LANG_ID, sampleEntries_1);
@@ -1264,10 +1272,10 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
 		assertTrue(provider1.equals(providerClone));
 		assertTrue(provider1.getClass()==providerClone.getClass());
 
-		assertEquals(provider1.getCustomParameter(), providerClone.getCustomParameter());
+		assertEquals(provider1.getProperty(ATTR_PARAMETER), providerClone.getProperty(ATTR_PARAMETER));
 		// ensure we did not clone reference
-		provider1.setCustomParameter("");
+		provider1.setProperty(ATTR_PARAMETER, "");
-		assertFalse(provider1.getCustomParameter().equals(providerClone.getCustomParameter()));
+		assertFalse(provider1.getProperty(ATTR_PARAMETER).equals(providerClone.getProperty(ATTR_PARAMETER)));
 
 		assertEquals(LanguageSettingsManager.isStoringEntriesInProjectArea(provider1), LanguageSettingsManager.isStoringEntriesInProjectArea(providerClone));
 		// ensure we did not clone reference
@@ -1309,7 +1317,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
 		}
 		MockSerializableProvider provider1 = new MockSerializableProvider(PROVIDER_1, PROVIDER_NAME_1);
 		provider1.setLanguageScope(sampleLanguages);
-		provider1.setCustomParameter(CUSTOM_PARAMETER);
+		provider1.setProperty(ATTR_PARAMETER, VALUE_PARAMETER);
 		assertEquals(false, LanguageSettingsManager.isStoringEntriesInProjectArea(provider1));
 		LanguageSettingsManager.setStoringEntriesInProjectArea(provider1, true);
 
@@ -1322,7 +1330,7 @@ public class LanguageSettingsSerializableTests extends BaseTestCase {
 		assertNotSame(provider1, providerClone);
 		assertFalse(provider1.equals(providerClone));
 		assertTrue(provider1.getClass()==providerClone.getClass());
-		assertEquals(provider1.getCustomParameter(), providerClone.getCustomParameter());
+		assertEquals(provider1.getProperty(ATTR_PARAMETER), providerClone.getProperty(ATTR_PARAMETER));
 		assertEquals(LanguageSettingsManager.isStoringEntriesInProjectArea(provider1), LanguageSettingsManager.isStoringEntriesInProjectArea(providerClone));
 		assertEquals(provider1.getLanguageScope().get(0), providerClone.getLanguageScope().get(0));
 

core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/settings/providers/MockLanguageSettingsBaseProvider.java

@@ -1,19 +1,23 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2009 Andrew Gvozdev (Quoin Inc.) and others.
+ * Copyright (c) 2009, 2011 Andrew Gvozdev and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     Andrew Gvozdev (Quoin Inc.) - initial API and implementation
+ *     Andrew Gvozdev - initial API and implementation
  *******************************************************************************/
-
 package org.eclipse.cdt.core.language.settings.providers;
 
-import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsBaseProvider;
-
-
 public class MockLanguageSettingsBaseProvider extends LanguageSettingsBaseProvider {
+	private static final String ATTR_PARAMETER = "parameter"; //$NON-NLS-1$
+
+	/**
+	 * @return the custom parameter defined in the extension in {@code plugin.xml}.
+	 */
+	public String getCustomParameter() {
+		return getProperty(ATTR_PARAMETER);
+	}
 
 }

core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsBaseProvider.java

@@ -13,7 +13,9 @@ package org.eclipse.cdt.core.language.settings.providers;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.eclipse.cdt.core.AbstractExecutableExtensionBase;
 import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
@@ -27,15 +29,13 @@ import org.eclipse.core.resources.IResource;
  *
  * This implementation supports "static" list of entries for languages specified in
  * the extension point.
- *
- * @since 6.0
  */
 public class LanguageSettingsBaseProvider extends AbstractExecutableExtensionBase implements ILanguageSettingsProvider {
 	/** Language scope, i.e. list of languages the entries will be provided for. */
 	protected List<String> languageScope = null;
 
-	/** Custom parameter. Intended for providers extending this class. */
+	/** Provider-specific properties */
-	protected String customParameter = null;
+	protected Map<String, String> properties = new HashMap<String, String>();
 
 	/** List of entries defined by this provider. */
 	private List<ICLanguageSettingEntry> entries = null;
@@ -85,15 +85,15 @@ public class LanguageSettingsBaseProvider extends AbstractExecutableExtensionBas
 	 *    are provided for any language.
 	 * @param entries - the list of language settings entries this provider provides.
 	 *    If {@code null} is passed, the provider creates an empty list.
-	 * @param customParameter - a custom parameter as the means to customize
+	 * @param properties - custom properties as the means to customize providers.
-	 *    providers extending this class.
 	 */
 	public LanguageSettingsBaseProvider(String id, String name, List<String> languages,
-			List<ICLanguageSettingEntry> entries, String customParameter) {
+			List<ICLanguageSettingEntry> entries, Map<String, String> properties) {
 		super(id, name);
 		this.languageScope = languages!=null ? new ArrayList<String>(languages) : null;
 		this.entries = getPooledList(entries);
-		this.customParameter = customParameter;
+		if (properties != null)
+			this.properties = new HashMap<String, String>(properties);
 	}
 
 	/**
@@ -111,21 +111,34 @@ public class LanguageSettingsBaseProvider extends AbstractExecutableExtensionBas
 	 *    are provided for any language.
 	 * @param entries - the list of language settings entries this provider provides.
 	 *    If {@code null} is passed, the provider creates an empty list.
-	 * @param customParameter - a custom parameter as the means to customize
+	 * @param properties - custom properties as the means to customize providers.
-	 *    providers extending this class from extension definition in {@code plugin.xml}.
 	 *
 	 * @throws UnsupportedOperationException if an attempt to reconfigure provider is made.
 	 */
 	public void configureProvider(String id, String name, List<String> languages,
-			List<ICLanguageSettingEntry> entries, String customParameter) {
+			List<ICLanguageSettingEntry> entries, Map<String, String> properties) {
-		if (this.entries!=null)
+		if (this.entries!=null || !this.properties.isEmpty())
 			throw new UnsupportedOperationException(SettingsModelMessages.getString("LanguageSettingsBaseProvider.CanBeConfiguredOnlyOnce")); //$NON-NLS-1$
 
 		setId(id);
 		setName(name);
 		this.languageScope = languages!=null ? new ArrayList<String>(languages) : null;
 		this.entries = getPooledList(entries);
-		this.customParameter = customParameter;
+		if (properties != null)
+			this.properties = new HashMap<String, String>(properties);
+	}
+
+	/**
+	 * {@code LanguageSettingsBaseProvider} keeps the list of key-value pairs
+	 * so extenders of this class can customize the provider. The properties
+	 * of {@code LanguageSettingsBaseProvider} come from the extension in plugin.xml
+	 * although the extenders can provide their own method.
+	 *
+	 * @param key - property to check the value.
+	 * @return value of the property.
+	 */
+	public String getProperty(String key) {
+		return properties.get(key);
 	}
 
 	private List<ICLanguageSettingEntry> getPooledList(List<ICLanguageSettingEntry> entries) {
@@ -168,11 +181,4 @@ public class LanguageSettingsBaseProvider extends AbstractExecutableExtensionBas
 			return null;
 		return Collections.unmodifiableList(languageScope);
 	}
-
-	/**
-	 * @return the custom parameter defined in the extension in {@code plugin.xml}.
-	 */
-	public String getCustomParameter() {
-		return customParameter;
-	}
 }

core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/language/settings/providers/LanguageSettingsSerializableProvider.java

@@ -44,9 +44,7 @@ public class LanguageSettingsSerializableProvider extends LanguageSettingsBasePr
 	private static final String ELEM_LANGUAGE_SCOPE = "language-scope"; //$NON-NLS-1$
 	private static final String ATTR_NAME = "name"; //$NON-NLS-1$
 	private static final String ATTR_CLASS = "class"; //$NON-NLS-1$
-	private static final String ATTR_PARAMETER = "parameter"; //$NON-NLS-1$
 
-	private Map<String, String> properties = new HashMap<String, String>();
 	private LanguageSettingsSerializableStorage fStorage = new LanguageSettingsSerializableStorage();
 
 	/**
@@ -78,9 +76,9 @@ public class LanguageSettingsSerializableProvider extends LanguageSettingsBasePr
 	}
 
 	@Override
-	public void configureProvider(String id, String name, List<String> languages, List<ICLanguageSettingEntry> entries, String customParameter) {
+	public void configureProvider(String id, String name, List<String> languages, List<ICLanguageSettingEntry> entries, Map<String, String> properties) {
 		// do not pass entries to super, keep them in local storage
-		super.configureProvider(id, name, languages, null, customParameter);
+		super.configureProvider(id, name, languages, null, properties);
 
 		fStorage.clear();
 
@@ -113,16 +111,6 @@ public class LanguageSettingsSerializableProvider extends LanguageSettingsBasePr
 			this.languageScope = new ArrayList<String>(languages);
 	}
 
-	/**
-	 * Set custom parameter for the provider.
-	 * Subclasses are free to define how their behavior depends on custom parameter.
-	 *
-	 * @param customParameter
-	 */
-	public void setCustomParameter(String customParameter) {
-		this.customParameter = customParameter;
-	}
-
 	/**
 	 * Clear all the entries for all configurations, all resources and all languages.
 	 */
@@ -218,8 +206,6 @@ public class LanguageSettingsSerializableProvider extends LanguageSettingsBasePr
 		attributes.add(getName());
 		attributes.add(ATTR_CLASS);
 		attributes.add(getClass().getCanonicalName());
-		attributes.add(ATTR_PARAMETER);
-		attributes.add(getCustomParameter());
 		for (Entry<String, String> entry : properties.entrySet()) {
 			attributes.add(entry.getKey());
 			attributes.add(entry.getValue());
@@ -281,7 +267,6 @@ public class LanguageSettingsSerializableProvider extends LanguageSettingsBasePr
 	public void loadAttributes(Element providerNode) {
 		String providerId = XmlUtil.determineAttributeValue(providerNode, ATTR_ID);
 		String providerName = XmlUtil.determineAttributeValue(providerNode, ATTR_NAME);
-		String providerParameter = XmlUtil.determineAttributeValue(providerNode, ATTR_PARAMETER);
 
 		properties.clear();
 		NamedNodeMap attrs = providerNode.getAttributes();
@@ -298,7 +283,6 @@ public class LanguageSettingsSerializableProvider extends LanguageSettingsBasePr
 
 		this.setId(providerId);
 		this.setName(providerName);
-		this.setCustomParameter(providerParameter);
 
 		NodeList nodes = providerNode.getChildNodes();
 		for (int i=0;i<nodes.getLength();i++) {
@@ -322,17 +306,19 @@ public class LanguageSettingsSerializableProvider extends LanguageSettingsBasePr
 	}
 
 	/**
-	 * TODO
+	 * Set a custom property of the provider.
-	 */
+	 * @see LanguageSettingsBaseProvider#getProperty(String)
-	public String getProperty(String key) {
+	 *
-		return properties.get(key);
+	 * @param key - name of the property.
-	}
+	 * @param value - value of the property.
-
+	 *    If value is {@code null} the property is removed from the list.
-	/**
-	 * TODO
 	 */
 	public void setProperty(String key, String value) {
-		properties.put(key, value);
+		if (value != null) {
+			properties.put(key, value);
+		} else {
+			properties.remove(key);
+		}
 	}
 
 	/**
@@ -374,7 +360,6 @@ public class LanguageSettingsSerializableProvider extends LanguageSettingsBasePr
 		result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
 		result = prime * result + ((getName() == null) ? 0 : getName().hashCode());
 		result = prime * result + ((languageScope == null) ? 0 : languageScope.hashCode());
-		result = prime * result + ((customParameter == null) ? 0 : customParameter.hashCode());
 		result = prime * result + ((properties == null) ? 0 : properties.hashCode());
 		result = prime * result + ((fStorage == null) ? 0 : fStorage.hashCode());
 		result = prime * result + getClass().hashCode();
@@ -417,12 +402,6 @@ public class LanguageSettingsSerializableProvider extends LanguageSettingsBasePr
 		} else if (!languageScope.equals(other.languageScope))
 			return false;
 
-		if (customParameter == null) {
-			if (other.customParameter != null)
-				return false;
-		} else if (!customParameter.equals(other.customParameter))
-			return false;
-
 		if (properties == null) {
 			if (other.properties != null)
 				return false;

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

@@ -13,8 +13,10 @@ package org.eclipse.cdt.internal.core.language.settings.providers;
 
 import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
 
@@ -49,7 +51,6 @@ public class LanguageSettingsExtensionManager {
 	static final String ATTR_CLASS = "class"; //$NON-NLS-1$
 	static final String ATTR_ID = "id"; //$NON-NLS-1$
 	static final String ATTR_NAME = "name"; //$NON-NLS-1$
-	static final String ATTR_PARAMETER = "parameter"; //$NON-NLS-1$
 
 	static final String ELEM_LANGUAGE_SCOPE = "language-scope"; //$NON-NLS-1$
 
@@ -163,10 +164,14 @@ public class LanguageSettingsExtensionManager {
 	private static void configureExecutableProvider(ILanguageSettingsProvider provider, IConfigurationElement ce) {
 		String ceId = determineAttributeValue(ce, ATTR_ID);
 		String ceName = determineAttributeValue(ce, ATTR_NAME);
-		String ceParameter = determineAttributeValue(ce, ATTR_PARAMETER);
+		Map<String, String> ceAttributes = new HashMap<String, String>();
 		List<String> languages = null;
 		List<ICLanguageSettingEntry> entries = null;
 
+		for (String attr : ce.getAttributeNames()) {
+			ceAttributes.put(attr, determineAttributeValue(ce, attr));
+		}
+
 		for (IConfigurationElement ceLang : ce.getChildren(ELEM_LANGUAGE_SCOPE)) {
 			String langId = determineAttributeValue(ceLang, ATTR_ID);
 			if (langId.length() > 0) {
@@ -203,7 +208,7 @@ public class LanguageSettingsExtensionManager {
 		}
 
 		if (provider instanceof LanguageSettingsBaseProvider) {
-			((LanguageSettingsBaseProvider) provider).configureProvider(ceId, ceName, languages, entries, ceParameter);
+			((LanguageSettingsBaseProvider) provider).configureProvider(ceId, ceName, languages, entries, ceAttributes);
 		} else if (provider instanceof AbstractExecutableExtensionBase) {
 			((AbstractExecutableExtensionBase) provider).setId(ceId);
 			((AbstractExecutableExtensionBase) provider).setName(ceName);