From 15e8a07e71b1ef8dee8577b352da7d49eb460c90 Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Tue, 29 Jun 2004 19:48:10 +0000 Subject: [PATCH] 2004-06-29 Alain Magloire Fix for PR 68820. * model/org/eclipse/cdt/internal/core/model/DeltaProcessor.java --- core/org.eclipse.cdt.core/ChangeLog | 5 +++++ .../eclipse/cdt/internal/core/model/DeltaProcessor.java | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/core/org.eclipse.cdt.core/ChangeLog b/core/org.eclipse.cdt.core/ChangeLog index bb0b6fca526..ddfa9fb5371 100644 --- a/core/org.eclipse.cdt.core/ChangeLog +++ b/core/org.eclipse.cdt.core/ChangeLog @@ -1,3 +1,8 @@ +2004-06-29 Alain Magloire + + Fix for PR 68820. + * model/org/eclipse/cdt/internal/core/model/DeltaProcessor.java + 2004-06-28 Bogdan Gheorghe Fix for 67656: [Indexer] getting called twice after creating a project with a file system * model/org/eclipse/cdt/internal/core/model/DeltaProcessor.java diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DeltaProcessor.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DeltaProcessor.java index 54dbc31d7e9..93e6c1e7696 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DeltaProcessor.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/DeltaProcessor.java @@ -430,9 +430,14 @@ public class DeltaProcessor { IResource resource = delta.getResource(); ICElement current = createElement(resource); updateChildren = updateCurrentDeltaAndIndex(delta); - if (current == null || current instanceof ISourceRoot || - (current instanceof ICProject && !((ICProject)current).getProject().isOpen())) { + if (current == null || current instanceof ISourceRoot) { nonCResourcesChanged(parent, delta); + } else if (current instanceof ICProject) { + ICProject cprj = (ICProject)current; + CModel cModel = CModelManager.getDefault().getCModel(); + if (!cprj.getProject().isOpen() || cModel.findCProject(cprj.getProject()) == null) { + nonCResourcesChanged(parent, delta); + } } else { parent = current; }