From 20e689bd276ebd3b5cc88c0cbd31f19d89222164 Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Wed, 7 Sep 2011 16:12:32 -0400 Subject: [PATCH] Use ILanguage rather than ILanguageDescriptor for getName() --- .../scannerconfig/AbstractBuiltinSpecsDetector.java | 6 ++---- .../settings/providers/LanguageSettingsEntriesTab.java | 8 ++++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/scannerconfig/AbstractBuiltinSpecsDetector.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/scannerconfig/AbstractBuiltinSpecsDetector.java index b21b0b4f64c..72f6413f8b2 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/scannerconfig/AbstractBuiltinSpecsDetector.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/scannerconfig/AbstractBuiltinSpecsDetector.java @@ -16,16 +16,14 @@ import java.io.OutputStream; import java.net.URI; import java.net.URL; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.CommandLauncher; import org.eclipse.cdt.core.ErrorParserManager; import org.eclipse.cdt.core.ICommandLauncher; import org.eclipse.cdt.core.IConsoleParser; -import org.eclipse.cdt.core.model.ILanguageDescriptor; +import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.model.LanguageManager; import org.eclipse.cdt.core.resources.IConsole; import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; @@ -368,7 +366,7 @@ public abstract class AbstractBuiltinSpecsDetector extends AbstractLanguageSetti } private IConsole startProviderConsole() { - ILanguageDescriptor ld = LanguageManager.getInstance().getLanguageDescriptor(currentLanguageId); + ILanguage ld = LanguageManager.getInstance().getLanguage(currentLanguageId); String consoleId = MakeCorePlugin.PLUGIN_ID + '.' + getId() + '.' + currentLanguageId; String consoleName = getName() + ", " + ld.getName(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsEntriesTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsEntriesTab.java index 00ed09ddbf8..5b21eab569a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsEntriesTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/settings/providers/LanguageSettingsEntriesTab.java @@ -50,6 +50,7 @@ import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsManager; import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsManager_TBD; import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsSerializable; import org.eclipse.cdt.core.language.settings.providers.ScannerDiscoveryLegacySupport; +import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.model.ILanguageDescriptor; import org.eclipse.cdt.core.model.LanguageManager; import org.eclipse.cdt.core.model.util.CDTListComparator; @@ -919,12 +920,11 @@ public class LanguageSettingsEntriesTab extends AbstractCPropertyTab { if (langId==null || langId.length()==0) continue; - LanguageManager langManager = LanguageManager.getInstance(); - ILanguageDescriptor langDes = langManager.getLanguageDescriptor(langId); - if (langDes == null) + ILanguage language = LanguageManager.getInstance().getLanguage(langId); + if (language == null) continue; - langId = langDes.getName(); + langId = language.getName(); if (langId == null || langId.length()==0) continue;