mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-03 07:05:24 +02:00
Reducting LanguageSettingsManager_TBD
This commit is contained in:
parent
45cc4634f1
commit
f6151d3a72
4 changed files with 12 additions and 16 deletions
|
@ -51,7 +51,6 @@ import org.eclipse.cdt.core.AbstractCExtension;
|
|||
import org.eclipse.cdt.core.CCorePlugin;
|
||||
import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsProvider;
|
||||
import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsManager;
|
||||
import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsManager_TBD;
|
||||
import org.eclipse.cdt.core.model.CoreModel;
|
||||
import org.eclipse.cdt.core.model.CoreModelUtil;
|
||||
import org.eclipse.cdt.core.parser.IScannerInfo;
|
||||
|
@ -151,8 +150,6 @@ import org.w3c.dom.ProcessingInstruction;
|
|||
* @noinstantiate This class is not intended to be instantiated by clients.
|
||||
*/
|
||||
public class ManagedBuildManager extends AbstractCExtension {
|
||||
|
||||
public static final String MBS_LANGUAGE_SETTINGS_PROVIDER = "org.eclipse.cdt.managedbuilder.core.LanguageSettingsProvider";
|
||||
// private static final QualifiedName buildInfoProperty = new QualifiedName(ManagedBuilderCorePlugin.PLUGIN_ID, "managedBuildInfo"); //$NON-NLS-1$
|
||||
private static final String ROOT_NODE_NAME = "ManagedProjectBuildInfo"; //$NON-NLS-1$
|
||||
public static final String SETTINGS_FILE_NAME = ".cdtbuild"; //$NON-NLS-1$
|
||||
|
@ -194,6 +191,10 @@ public class ManagedBuildManager extends AbstractCExtension {
|
|||
|
||||
public static final String INTERNAL_BUILDER_ID = "org.eclipse.cdt.build.core.internal.builder"; //$NON-NLS-1$
|
||||
|
||||
public static final String MBS_LANGUAGE_SETTINGS_PROVIDER = "org.eclipse.cdt.managedbuilder.core.LanguageSettingsProvider";
|
||||
private static final String UI_USER_LANGUAGE_SETTINGS_PROVIDER = "org.eclipse.cdt.ui.user.LanguageSettingsProvider";
|
||||
private static final String LANGUAGE_SETTINGS_PROVIDER_DELIMITER = ";";
|
||||
|
||||
private static final String os = Platform.getOS();
|
||||
private static final String arch = Platform.getOSArch();
|
||||
private static final String ALL = "all"; //$NON-NLS-1$
|
||||
|
@ -4758,7 +4759,7 @@ public class ManagedBuildManager extends AbstractCExtension {
|
|||
}
|
||||
providersIdsStr = providersIdsStr.replaceAll("\\$\\{Toolchain\\}", toolchainProvidersIds);
|
||||
}
|
||||
List<String> providersIds = Arrays.asList(providersIdsStr.split(String.valueOf(LanguageSettingsManager_TBD.PROVIDER_DELIMITER)));
|
||||
List<String> providersIds = Arrays.asList(providersIdsStr.split(LANGUAGE_SETTINGS_PROVIDER_DELIMITER));
|
||||
for (String id : providersIds) {
|
||||
id = id.trim();
|
||||
ILanguageSettingsProvider provider = null;
|
||||
|
@ -4790,8 +4791,8 @@ public class ManagedBuildManager extends AbstractCExtension {
|
|||
providers.add(provider);
|
||||
}
|
||||
|
||||
if (!isProviderThere(providers, LanguageSettingsManager_TBD.PROVIDER_UI_USER)) {
|
||||
ILanguageSettingsProvider provider = LanguageSettingsManager.getExtensionProviderCopy(LanguageSettingsManager_TBD.PROVIDER_UI_USER);
|
||||
if (!isProviderThere(providers, UI_USER_LANGUAGE_SETTINGS_PROVIDER)) {
|
||||
ILanguageSettingsProvider provider = LanguageSettingsManager.getExtensionProviderCopy(UI_USER_LANGUAGE_SETTINGS_PROVIDER);
|
||||
providers.add(0, provider);
|
||||
}
|
||||
|
||||
|
|
|
@ -48,6 +48,7 @@ public class LanguageSettingsExtensionsTests extends BaseTestCase {
|
|||
/*package*/ static final String EXTENSION_EDITABLE_PROVIDER_ID = "org.eclipse.cdt.core.tests.custom.editable.language.settings.provider";
|
||||
/*package*/ static final String EXTENSION_EDITABLE_PROVIDER_NAME = "Test Plugin Mock Editable Language Settings Provider";
|
||||
/*package*/ static final String EXTENSION_REGISTERER_PROVIDER_ID = "org.eclipse.cdt.core.tests.language.settings.listener.registerer.provider";
|
||||
/*package*/ static final String EXTENSION_USER_PROVIDER_ID = "org.eclipse.cdt.ui.user.LanguageSettingsProvider";
|
||||
|
||||
// These are made up
|
||||
private static final String PROVIDER_0 = "test.provider.0.id";
|
||||
|
@ -328,8 +329,8 @@ public class LanguageSettingsExtensionsTests extends BaseTestCase {
|
|||
* Check that LanguageSettingsGenericProvider extension defined in plugin.xml is accessible.
|
||||
*/
|
||||
public void testExtensionGenericProvider() throws Exception {
|
||||
ILanguageSettingsProvider provider = LanguageSettingsExtensionManager.getExtensionProviderClone(LanguageSettingsManager_TBD.PROVIDER_UI_USER);
|
||||
assertNotNull("extension " + LanguageSettingsManager_TBD.PROVIDER_UI_USER + " not found", provider);
|
||||
ILanguageSettingsProvider provider = LanguageSettingsExtensionManager.getExtensionProviderClone(EXTENSION_USER_PROVIDER_ID);
|
||||
assertNotNull("extension " + EXTENSION_USER_PROVIDER_ID + " not found", provider);
|
||||
assertTrue(provider instanceof LanguageSettingsGenericProvider);
|
||||
}
|
||||
|
||||
|
|
|
@ -17,7 +17,6 @@ import org.eclipse.cdt.core.CCorePlugin;
|
|||
import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
|
||||
import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry;
|
||||
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.IProject;
|
||||
import org.eclipse.core.resources.IResource;
|
||||
|
||||
|
@ -25,10 +24,6 @@ import org.eclipse.core.resources.IResource;
|
|||
* This temporary class keeps the utility methods being looking for better home
|
||||
*/
|
||||
public class LanguageSettingsManager_TBD {
|
||||
public static final String PROVIDER_UNKNOWN = "org.eclipse.cdt.projectmodel.4.0.0";
|
||||
public static final String PROVIDER_UI_USER = "org.eclipse.cdt.ui.user.LanguageSettingsProvider";
|
||||
public static final char PROVIDER_DELIMITER = LanguageSettingsProvidersSerializer.PROVIDER_DELIMITER;
|
||||
|
||||
public static boolean isCustomizedResource(ICConfigurationDescription cfgDescription, IResource rc) {
|
||||
if (rc instanceof IProject)
|
||||
return false;
|
||||
|
|
|
@ -63,7 +63,6 @@ public class LanguageSettingsProvidersSerializer {
|
|||
private static final String STORAGE_WORKSPACE_LANGUAGE_SETTINGS = "language.settings.xml"; //$NON-NLS-1$
|
||||
private static final String SETTINGS_FOLDER_NAME = ".settings/"; //$NON-NLS-1$
|
||||
private static final String STORAGE_PROJECT_LANGUAGE_SETTINGS = "language.settings.xml"; //$NON-NLS-1$
|
||||
public static final char PROVIDER_DELIMITER = ';';
|
||||
private static final String ELEM_PLUGIN = "plugin"; //$NON-NLS-1$
|
||||
private static final String ELEM_EXTENSION = "extension"; //$NON-NLS-1$
|
||||
private static final String ATTR_POINT = "point"; //$NON-NLS-1$
|
||||
|
@ -761,8 +760,8 @@ projects:
|
|||
for (ICConfigurationDescription cfgDescription : cfgDescriptions) {
|
||||
if (cfgDescription!=null) {
|
||||
List<ILanguageSettingsProvider> providers = new ArrayList<ILanguageSettingsProvider>(2);
|
||||
ILanguageSettingsProvider userProvider = getWorkspaceProvider(ScannerDiscoveryLegacySupport.MBS_LANGUAGE_SETTINGS_PROVIDER);
|
||||
providers.add(userProvider);
|
||||
ILanguageSettingsProvider providerMBS = getWorkspaceProvider(ScannerDiscoveryLegacySupport.MBS_LANGUAGE_SETTINGS_PROVIDER);
|
||||
providers.add(providerMBS);
|
||||
cfgDescription.setLanguageSettingProviders(providers);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue