From c421d5746a20e839a0fe94b2093b89399d443a2a Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Fri, 30 Apr 2004 04:08:03 +0000 Subject: [PATCH] bug in APathEntry.equals() --- .../org/eclipse/cdt/internal/core/model/APathEntry.java | 6 ++++++ .../eclipse/cdt/internal/core/model/IncludeReference.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/APathEntry.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/APathEntry.java index cedc2f4fb4b..6d4882c9113 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/APathEntry.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/APathEntry.java @@ -108,6 +108,12 @@ public abstract class APathEntry extends PathEntry { return false; } } + IPath otherBaseRef = otherEntry.getBaseReference(); + if (baseRef != null) { + if (otherBaseRef != null && !baseRef.equals(otherBaseRef)) { + return false; + } + } return true; } return super.equals(obj); diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/IncludeReference.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/IncludeReference.java index 4f3e20870b5..426224a3d97 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/IncludeReference.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/IncludeReference.java @@ -45,7 +45,7 @@ public class IncludeReference extends Openable implements IIncludeReference { } public IncludeReference(ICElement celement, IIncludeEntry entry, IPath path) { - super(celement, null, path.lastSegment(), ICElement.C_VCONTAINER); + super(celement, null, path.toString(), ICElement.C_VCONTAINER); fIncludeEntry = entry; fPath = path; }