From 499b1065418d1c121c5810ac8bbbf2f3c236a006 Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Mon, 18 Oct 2010 05:37:39 +0000 Subject: [PATCH] bug 311429: Inconsistent showing of "Languages" in Paths&Symbols tab --- .../eclipse/cdt/core/settings/model/MultiLanguageSetting.java | 2 +- .../src/org/eclipse/cdt/ui/newui/AbstractLangsListTab.java | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/MultiLanguageSetting.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/MultiLanguageSetting.java index 692ba918533..e6cf701c1e5 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/MultiLanguageSetting.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/MultiLanguageSetting.java @@ -31,7 +31,7 @@ public class MultiLanguageSetting extends MultiItemsHolder implements ICLanguage * @see org.eclipse.cdt.core.settings.model.ICLanguageSetting#getLanguageId() */ public String getLanguageId() { - return null; // IDs are different. + return items[0].getLanguageId(); // Assuming language is the same. } /* (non-Javadoc) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractLangsListTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractLangsListTab.java index 5d5985aa41b..6f34f17931d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractLangsListTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractLangsListTab.java @@ -396,10 +396,6 @@ public abstract class AbstractLangsListTab extends AbstractCPropertyTab { if ((langSetting.getSupportedEntryKinds() & getKind()) != 0) { TreeItem t = new TreeItem(langTree, SWT.NONE); String langId = langSetting.getLanguageId(); - if (langId==null && (langSetting instanceof MultiLanguageSetting)) { - ICLanguageSetting item1 = (ICLanguageSetting) ((MultiLanguageSetting)langSetting).getItems()[0]; - langId = item1.getLanguageId(); - } if (langId != null && !langId.equals(EMPTY_STR)) { // Bug #178033: get language name via LangManager. ILanguageDescriptor langDes = LanguageManager.getInstance().getLanguageDescriptor(langId);