From 1aa3d8f62fad027b71121ec4325f4afe698fc27c Mon Sep 17 00:00:00 2001
From: Oleg Krasilnikov <oleg.krasilnikov@intel.com>
Date: Thu, 26 Apr 2007 10:22:21 +0000
Subject: [PATCH] Bug #182820: fix for "canExclude()"

---
 .../core/settings/model/util/CDataUtil.java   | 34 ++++++++++++++++---
 .../model/CConfigurationDescription.java      |  4 ++-
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/CDataUtil.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/CDataUtil.java
index 2b4d8861e7d..f07ca395ec3 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/CDataUtil.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/CDataUtil.java
@@ -577,12 +577,38 @@ public class CDataUtil {
 
 	public static boolean canExclude(IPath path, boolean isFolder, boolean excluded, ICSourceEntry[] entries){
 		try {
-			return setExcluded(path, isFolder, excluded, entries, false) != null;
-		} catch (CoreException e) {
-		}
+			ICSourceEntry[] out = setExcluded(path, isFolder, excluded, entries, false);
+			return !isEqual(entries, out);
+		} catch (CoreException e) {	}
 		return false;
 	}
 
+	/**
+	 * 
+	 * @param ein - initial source entries
+	 * @param aus - resulting source entries
+	 * @return - true if they are equal 
+	 */
+	public static boolean isEqual(ICSourceEntry[] ein, ICSourceEntry[] aus) {
+		if (ein == null || aus == null) return (ein == null && aus == null);
+		if (ein.length != aus.length) return false;
+		for (int i=0; i<ein.length; i++) {
+			boolean found = false;
+			for (int j=0; j<aus.length; j++) {
+				if (!ein[i].equalsByName(aus[j]))
+					continue;
+				if (ein[i].equalsByContents(aus[j])) {
+					found = true;
+					break;
+				}
+				return false; // contents is changed !	
+			}
+			if (!found) 
+				return false; // name is not found !
+		}
+		return true; // all entries are equal by name and contents
+	}
+	
 	public static ICSourceEntry[] setExcluded(IPath path, boolean isFolder, boolean excluded, ICSourceEntry[] entries) throws CoreException {
 		return setExcluded(path, isFolder, excluded, entries, true);
 	}
@@ -635,7 +661,7 @@ public class CDataUtil {
 					includeList.add(new CSourceEntry(path, null, ICSettingEntry.VALUE_WORKSPACE_PATH | ICSettingEntry.RESOLVED));
 				} else {
 					if(throwExceptionOnErr)
-						throw ExceptionFactory.createCoreException("can not create a source entry for individual file");
+						throw ExceptionFactory.createCoreException("can not create a source entry for individual file"); //$NON-NLS-1$
 					return null;
 				}
 			}
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CConfigurationDescription.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CConfigurationDescription.java
index 6c3aebd82a4..b5cf1f854f9 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CConfigurationDescription.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CConfigurationDescription.java
@@ -772,7 +772,7 @@ public class CConfigurationDescription extends CDataProxyContainer implements IC
 	boolean canExclude(IPath path, boolean isFolder, boolean exclude){
 		if(isExcluded(path) == exclude)
 			return true;
-
+		
 		return getUpdatedSourceEntries(path, isFolder, exclude) != null;
 	}
 
@@ -804,6 +804,8 @@ public class CConfigurationDescription extends CDataProxyContainer implements IC
 		if(newEntries == null){
 			try {
 				newEntries = CDataUtil.setExcluded(path, isFolder, exclude, getResolvedSourceEntries(), false);
+				if (CDataUtil.isEqual(newEntries, getResolvedSourceEntries()))
+					newEntries = null;
 			} catch (CoreException e) {
 			}
 		}