From bad9887e8d5962b4ca840757f64c2e269f107edd Mon Sep 17 00:00:00 2001
From: Mikhail Sennikovsky <mikhail.sennikovskiy@gmail.com>
Date: Fri, 16 Nov 2007 16:14:44 +0000
Subject: [PATCH]  fix for the tool-chain modification functionality

---
 .../tcmodification/FileInfoModification.java  |  2 --
 .../tcmodification/TcModificationUtil.java    | 27 +++++++++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/FileInfoModification.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/FileInfoModification.java
index 16a928588b1..66a6092cddd 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/FileInfoModification.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/FileInfoModification.java
@@ -14,9 +14,7 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.eclipse.cdt.managedbuilder.core.IFileInfo;
 import org.eclipse.cdt.managedbuilder.core.IFolderInfo;
-import org.eclipse.cdt.managedbuilder.core.IResourceInfo;
 import org.eclipse.cdt.managedbuilder.core.ITool;
 import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
 import org.eclipse.cdt.managedbuilder.internal.core.ResourceConfiguration;
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/TcModificationUtil.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/TcModificationUtil.java
index d5d6d2638e6..771b79f6f22 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/TcModificationUtil.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/TcModificationUtil.java
@@ -276,6 +276,33 @@ public class TcModificationUtil {
 			}
 		}
 		
+		if(initialMap.size() != 0){
+			for(Iterator iter = initialMap.entrySet().iterator(); iter.hasNext(); ){
+				Map.Entry entry = (Map.Entry)iter.next();
+				Object oPath = entry.getKey();
+				
+				PerTypeSetStorage initStorage = (PerTypeSetStorage)entry.getValue();
+
+				if(!initStorage.isEmpty(true)){
+					PerTypeSetStorage storage = new PerTypeSetStorage();
+
+					for(int i = 0; i < types.length; i++){
+						Set set = initStorage.getSet(types[i], false);
+						if(set != null && set.size() != 0){
+							storage.getSet(types[i], true).addAll(set);
+						}
+					}
+					
+					if(!storage.isEmpty(false)){
+						result.put(oPath, storage);
+					}
+
+				}
+				
+			}
+		}
+
+		
 		return result;
 	}