# HG changeset patch
# User dadubrow
# Date 1244734841 18000
# Node ID 57a05dd59a20af813fbfcadbf7078ad55a64e3a3
# Parent  8717e2008e008c34bc14958c0272a094ddc06d6b
update with latest version of patch for path entry optimizations

diff -r 8717e2008e00 -r 57a05dd59a20 cdt/cdt_5_0_x/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/APathEntry.java
--- a/cdt/cdt_5_0_x/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/APathEntry.java	Tue Jun 09 15:42:55 2009 -0500
+++ b/cdt/cdt_5_0_x/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/APathEntry.java	Thu Jun 11 10:40:41 2009 -0500
@@ -82,11 +82,9 @@
 	public int hashCode() {
 		final int prime = 31;
 		int result = super.hashCode();
-		result = prime * result
-				+ ((basePath == null) ? 0 : basePath.hashCode());
+		result = prime * result + ((basePath == null) ? 0 : basePath.hashCode());
 		result = prime * result + ((baseRef == null) ? 0 : baseRef.hashCode());
 		result = prime * result + Arrays.hashCode(exclusionPatterns);
-		result = prime * result + Arrays.hashCode(fullCharExclusionPatterns);
 		return result;
 	}
 
diff -r 8717e2008e00 -r 57a05dd59a20 cdt/cdt_5_0_x/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/LibraryEntry.java
--- a/cdt/cdt_5_0_x/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/LibraryEntry.java	Tue Jun 09 15:42:55 2009 -0500
+++ b/cdt/cdt_5_0_x/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/LibraryEntry.java	Thu Jun 11 10:40:41 2009 -0500
@@ -145,10 +145,6 @@
 						.hashCode());
 		result = prime
 				* result
-				+ ((sourceAttachmentPrefixMapping == null) ? 0
-						: sourceAttachmentPrefixMapping.hashCode());
-		result = prime
-				* result
 				+ ((sourceAttachmentRootPath == null) ? 0
 						: sourceAttachmentRootPath.hashCode());
 		return result;
diff -r 8717e2008e00 -r 57a05dd59a20 cdt/cdt_5_0_x/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryUtil.java
--- a/cdt/cdt_5_0_x/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryUtil.java	Tue Jun 09 15:42:55 2009 -0500
+++ b/cdt/cdt_5_0_x/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryUtil.java	Thu Jun 11 10:40:41 2009 -0500
@@ -12,6 +12,7 @@
 package org.eclipse.cdt.internal.core.model;
 
 import java.io.File;
+import java.text.MessageFormat;
 import java.util.*;
 
 import org.eclipse.cdt.core.CCorePlugin;
@@ -336,8 +337,10 @@
 		for (IPathEntry entry : entries) {
 			if (entry != null) {
 				if (entrySet.contains(entry)) {
-					StringBuffer errMesg = new StringBuffer(CCorePlugin.getResourceString("CoreModel.PathEntry.DuplicateEntry")); //$NON-NLS-1$
-					return new CModelStatus(ICModelStatusConstants.INVALID_PATHENTRY, errMesg.toString());
+					return new CModelStatus(ICModelStatusConstants.INVALID_PATHENTRY, 
+							MessageFormat.format("{0}{1}", //$NON-NLS-1$
+									CCorePlugin.getResourceString("CoreModel.PathEntry.DuplicateEntry"), //$NON-NLS-1$
+									entry.getPath().toString()));
 				}
 				else {
 					entrySet.add(entry);
diff -r 8717e2008e00 -r 57a05dd59a20 cdt/cdt_5_0_x/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CCorePluginResources.properties
--- a/cdt/cdt_5_0_x/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CCorePluginResources.properties	Tue Jun 09 15:42:55 2009 -0500
+++ b/cdt/cdt_5_0_x/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CCorePluginResources.properties	Thu Jun 11 10:40:41 2009 -0500
@@ -21,7 +21,7 @@
 CoreModel.NullBinaryParser.Null_Format=Null Format
 
 CoreModel.PathEntry.IllegalContainerPath= Illegal container entry
-CoreModel.PathEntry.DuplicateEntry= Duplicate path entries
+CoreModel.PathEntry.DuplicateEntry= Duplicate path entries found: {0}
 CoreModel.PathEntry.NestedEntry= Nested path entries
 CoreModel.PathEntry.InvalidPathEntry= Invalid path