From 3f454e4c3b24fcbc86392de21f8b7e436e7fc889 Mon Sep 17 00:00:00 2001
From: Mikhail Sennikovsky <mikhail.sennikovskiy@gmail.com>
Date: Mon, 26 Mar 2007 13:35:44 +0000
Subject: [PATCH] Additional fix for the tool-chain modification functionality

---
 .../cdt/managedbuilder/internal/core/FolderInfo.java     | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/FolderInfo.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/FolderInfo.java
index a18ad70c6bd..4618feb4bd2 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/FolderInfo.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/FolderInfo.java
@@ -808,6 +808,15 @@ public class FolderInfo extends ResourceInfo implements IFolderInfo {
 		
 		removedMap.keySet().removeAll(addedMap.keySet());
 		addedMap.keySet().removeAll(rmCopy.keySet());
+		
+		if(removedMap.size() != 0){
+			LinkedHashMap curMap = createRealMap(getTools());
+			for(Iterator iter = removedMap.keySet().iterator(); iter.hasNext();){
+				Object key = iter.next();
+				if(!curMap.containsKey(key))
+					iter.remove();
+			}
+		}
 		ITool[][] result = new Tool[2][];
 		result[0] = (Tool[])removedMap.values().toArray(new Tool[removedMap.size()]);
 		result[1] = (Tool[])addedMap.values().toArray(new Tool[addedMap.size()]);