mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-01 21:35:40 +02:00
Code Issues Wiki Activity

bug 311429: Inconsistent showing of "Languages" in Paths&Symbols tab

Browse source
This commit is contained in:
Andrew Gvozdev 2010-10-18 05:37:39 +00:00
parent cc39535a4b
commit 499b106541
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/MultiLanguageSetting.java
View file

@ -31,7 +31,7 @@ public class MultiLanguageSetting extends MultiItemsHolder implements ICLanguage
* @see org.eclipse.cdt.core.settings.model.ICLanguageSetting#getLanguageId() * @see org.eclipse.cdt.core.settings.model.ICLanguageSetting#getLanguageId()
*/ */
public String getLanguageId() { public String getLanguageId() {
return null; // IDs are different. return items[0].getLanguageId(); // Assuming language is the same.
} }
/* (non-Javadoc) /* (non-Javadoc)

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractLangsListTab.java
View file

@ -396,10 +396,6 @@ public abstract class AbstractLangsListTab extends AbstractCPropertyTab {
if ((langSetting.getSupportedEntryKinds() & getKind()) != 0) { if ((langSetting.getSupportedEntryKinds() & getKind()) != 0) {
TreeItem t = new TreeItem(langTree, SWT.NONE); TreeItem t = new TreeItem(langTree, SWT.NONE);
String langId = langSetting.getLanguageId(); 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)) { if (langId != null && !langId.equals(EMPTY_STR)) {
// Bug #178033: get language name via LangManager. // Bug #178033: get language name via LangManager.
ILanguageDescriptor langDes = LanguageManager.getInstance().getLanguageDescriptor(langId); ILanguageDescriptor langDes = LanguageManager.getInstance().getLanguageDescriptor(langId);