X-Git-Url: http://git.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaModelOperation.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaModelOperation.java index 4fc9675..a04b4f6 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaModelOperation.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaModelOperation.java @@ -381,7 +381,7 @@ public abstract class JavaModelOperation implements IWorkspaceRunnable, IProgres DeltaProcessor deltaProcessor = JavaModelManager.getJavaModelManager().deltaProcessor; if (deltaProcessor.roots == null) { // TODO khartlage temp-del - deltaProcessor.initializeRoots(); + deltaProcessor.initializeRoots(); } executeOperation(); } else { @@ -709,26 +709,27 @@ public abstract class JavaModelOperation implements IWorkspaceRunnable, IProgres } } } finally { -// TODO khartlage temp-del -// try { -// // update JavaModel using deltas that were recorded during this operation + + try { +// TODO khartlage temp-del + // update JavaModel using deltas that were recorded during this operation // for (int i = previousDeltaCount, size = manager.javaModelDeltas.size(); i < size; i++) { // manager.updateJavaModel((IJavaElementDelta)manager.javaModelDeltas.get(i)); // } -// -// // fire only iff: -// // - the operation is a top level operation -// // - the operation did produce some delta(s) -// // - but the operation has not modified any resource -// if (this.isTopLevelOperation()) { -// if ((manager.javaModelDeltas.size() > previousDeltaCount || !manager.reconcileDeltas.isEmpty()) -// && !this.hasModifiedResource()) { -// manager.fire(null, JavaModelManager.DEFAULT_CHANGE_EVENT); -// } // else deltas are fired while processing the resource delta -// } -// } finally { -// popOperation(); -// } + + // fire only iff: + // - the operation is a top level operation + // - the operation did produce some delta(s) + // - but the operation has not modified any resource + if (this.isTopLevelOperation()) { + if ((manager.javaModelDeltas.size() > previousDeltaCount || !manager.reconcileDeltas.isEmpty()) + && !this.hasModifiedResource()) { + manager.fire(null, JavaModelManager.DEFAULT_CHANGE_EVENT); + } // else deltas are fired while processing the resource delta + } + } finally { + popOperation(); + } } } protected void runPostActions() throws JavaModelException {