From e778f36c01b8172f42896e9556fd3f62ceab619d Mon Sep 17 00:00:00 2001
From: Oleg Krasilnikov <oleg.krasilnikov@intel.com>
Date: Thu, 29 Mar 2007 10:58:48 +0000
Subject: [PATCH] Bug #178033: get content type name via LanguageManager

---
 .../cdt/ui/newui/AbstractLangsListTab.java        | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

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 863a76b4b52..ca8c227a33e 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
@@ -43,6 +43,8 @@ import org.eclipse.swt.widgets.Tree;
 import org.eclipse.swt.widgets.TreeColumn;
 import org.eclipse.swt.widgets.TreeItem;
 
+import org.eclipse.cdt.core.model.ILanguageDescriptor;
+import org.eclipse.cdt.core.model.LanguageManager;
 import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
 import org.eclipse.cdt.core.settings.model.ICExternalSetting;
 import org.eclipse.cdt.core.settings.model.ICFileDescription;
@@ -281,7 +283,18 @@ public abstract class AbstractLangsListTab extends AbstractCPropertyTab {
 			for (int i=0; i<ls.length; i++) {
 				if ((ls[i].getSupportedEntryKinds() & getKind()) != 0) {
 					TreeItem t = new TreeItem(langTree, SWT.NONE);
-					t.setText(0, ls[i].getName());
+					String s = ls[i].getLanguageId();
+					if (s != null && !s.equals(EMPTY_STR)) {
+						// Bug #178033: get language name via LangManager.
+						ILanguageDescriptor ld = LanguageManager.getInstance().getLanguageDescriptor(s);
+						if (ld == null)
+							s = null;
+						else
+							s = ld.getName();
+					}
+					if (s == null || s.equals(EMPTY_STR))
+						s = "[" + ls[i].getName() + "]";  //$NON-NLS-1$ //$NON-NLS-2$
+					t.setText(0, s);
 					t.setData(ls[i]);
 					if (firstItem == null) { 
 						firstItem = t;