diff --git a/core/org.eclipse.cdt.core/ChangeLog b/core/org.eclipse.cdt.core/ChangeLog index 3bef3d028ec..4b2ef90c62c 100644 --- a/core/org.eclipse.cdt.core/ChangeLog +++ b/core/org.eclipse.cdt.core/ChangeLog @@ -1,3 +1,8 @@ +2005-03-03 Vladimir Hirsl + Small change for enabling generation of path entry container change events. + * model/org/eclipse/cdt/core/model/PathEntryContainerChanged.java + * model/org/eclipse/cdt/internal/core/model/PathEntryManager.java + 2005-03-02 Alain Magloire Fix PR 84527: PathEntryManager marker jobs were start to often. * model/org/eclipse/cdt/internla/core/model/PathEntrymanager.java diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/PathEntryContainerChanged.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/PathEntryContainerChanged.java index 23d0ce39c81..e6d1ebb9be2 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/PathEntryContainerChanged.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/PathEntryContainerChanged.java @@ -74,7 +74,7 @@ public class PathEntryContainerChanged { * @return */ public boolean isIncludeChange() { - return fType == INCLUDE_CHANGED; + return (fType & INCLUDE_CHANGED) != 0; } /** @@ -82,7 +82,7 @@ public class PathEntryContainerChanged { * @return */ public boolean isMacroChange() { - return fType == MACRO_CHANGED; + return (fType & MACRO_CHANGED) != 0; } } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryManager.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryManager.java index 5665fed0f09..6257daab466 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryManager.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryManager.java @@ -997,9 +997,10 @@ public class PathEntryManager implements IPathEntryStoreListener, IElementChange } int flag =0; if (event.isIncludeChange()) { - flag = ICElementDelta.F_CHANGED_PATHENTRY_INCLUDE; - } else if (event.isMacroChange()) { - flag = ICElementDelta.F_CHANGED_PATHENTRY_MACRO; + flag |= ICElementDelta.F_CHANGED_PATHENTRY_INCLUDE; + } + if (event.isMacroChange()) { + flag |= ICElementDelta.F_CHANGED_PATHENTRY_MACRO; } CElementDelta delta = new CElementDelta(celement.getCModel()); delta.changed(celement, flag);