From 2ed0cb1fd0a8d48245034c774087df92d9cea7c8 Mon Sep 17 00:00:00 2001
From: Oleg Krasilnikov <oleg.krasilnikov@intel.com>
Date: Fri, 23 Mar 2007 16:34:10 +0000
Subject: [PATCH] Restore defaults: fix

---
 .../eclipse/cdt/ui/newui/AbstractLangsListTab.java   | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

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 de2a1329e3f..bdd1940ed4e 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
@@ -172,7 +172,7 @@ public abstract class AbstractLangsListTab extends AbstractCPropertyTab {
 		if (canExport) {
 			ICLanguageSettingEntry ent = (ICLanguageSettingEntry)(table.getItem(index).getData());
 			if (ent.isBuiltIn() || ent.isReadOnly()) canEdit = false;
-			if (/*ent.isBuiltIn() || */ent.isReadOnly()) canDelete = false;
+			if (ent.isReadOnly()) canDelete = false;
 		}
     	boolean canMoveUp = canDelete && index > 0;
     	boolean canMoveDown = canDelete && (index < table.getItemCount() - 1); 
@@ -346,7 +346,7 @@ public abstract class AbstractLangsListTab extends AbstractCPropertyTab {
 		case 2: // delete
 			if (n == -1) return;
 			old = (ICLanguageSettingEntry)(table.getItem(n).getData());
-			if (old.isReadOnly() /*|| old.isBuiltIn()*/) return;
+			if (old.isReadOnly()) return;
 			incs.remove(old);
 			lang.setSettingEntries(getKind(), incs);
 			update();
@@ -409,7 +409,13 @@ public abstract class AbstractLangsListTab extends AbstractCPropertyTab {
 		}
 	}
 	protected void performDefaults() {
-		lang.setSettingEntries(getKind(), (List)null);
+		TreeItem[] tis = langTree.getItems();
+		for (int i=0; i<tis.length; i++) {
+			Object ob = tis[i].getData();
+			if (ob != null && ob instanceof ICLanguageSetting) {
+				((ICLanguageSetting)ob).setSettingEntries(getKind(), (List)null);
+			}
+		}
 		updateData(this.getResDesc());
 	}