X-Git-Url: http://secure.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/ReconcileWorkingCopyOperation.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/ReconcileWorkingCopyOperation.java index 9df9bea..b796ae9 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/ReconcileWorkingCopyOperation.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/ReconcileWorkingCopyOperation.java @@ -31,31 +31,77 @@ public class ReconcileWorkingCopyOperation extends JavaModelOperation { * @exception JavaModelException if setting the source * of the original compilation unit fails */ +// protected void executeOperation() throws JavaModelException { +// if (fMonitor != null){ +// if (fMonitor.isCanceled()) return; +// fMonitor.beginTask(Util.bind("element.reconciling"), 10); //$NON-NLS-1$ +// } +// +// WorkingCopy workingCopy = getWorkingCopy(); +// boolean wasConsistent = workingCopy.isConsistent(); +// JavaElementDeltaBuilder deltaBuilder = null; +// +// try { +// // create the delta builder (this remembers the current content of the cu) +// if (!wasConsistent){ +// deltaBuilder = new JavaElementDeltaBuilder(workingCopy); +// +// // update the element infos with the content of the working copy +// workingCopy.makeConsistent(fMonitor); +// deltaBuilder.buildDeltas(); +// +// } +// +// if (fMonitor != null) fMonitor.worked(2); +// +// // force problem detection? - if structure was consistent +// if (forceProblemDetection && wasConsistent){ +// if (fMonitor != null && fMonitor.isCanceled()) return; +// +// IProblemRequestor problemRequestor = workingCopy.problemRequestor; +// if (problemRequestor != null && problemRequestor.isActive()){ +// problemRequestor.beginReporting(); +// CompilationUnitProblemFinder.process(workingCopy, problemRequestor, fMonitor); +// problemRequestor.endReporting(); +// } +// } +// +// // register the deltas +// if (deltaBuilder != null){ +// if ((deltaBuilder.delta != null) && (deltaBuilder.delta.getAffectedChildren().length > 0)) { +// addReconcileDelta(workingCopy, deltaBuilder.delta); +// } +// } +// } finally { +// if (fMonitor != null) fMonitor.done(); +// } +// } protected void executeOperation() throws JavaModelException { + // TODO jsurfer optimize for PHP if (fMonitor != null){ if (fMonitor.isCanceled()) return; fMonitor.beginTask(Util.bind("element.reconciling"), 10); //$NON-NLS-1$ } WorkingCopy workingCopy = getWorkingCopy(); - boolean wasConsistent = workingCopy.isConsistent(); - JavaElementDeltaBuilder deltaBuilder = null; +// boolean wasConsistent = workingCopy.isConsistent(); +// JavaElementDeltaBuilder deltaBuilder = null; try { // create the delta builder (this remembers the current content of the cu) - if (!wasConsistent){ - deltaBuilder = new JavaElementDeltaBuilder(workingCopy); - - // update the element infos with the content of the working copy - workingCopy.makeConsistent(fMonitor); - deltaBuilder.buildDeltas(); - - } +// if (!wasConsistent){ +// deltaBuilder = new JavaElementDeltaBuilder(workingCopy); +// +// // update the element infos with the content of the working copy +// workingCopy.makeConsistent(fMonitor); +// deltaBuilder.buildDeltas(); +// +// } if (fMonitor != null) fMonitor.worked(2); // force problem detection? - if structure was consistent - if (forceProblemDetection && wasConsistent){ + if (forceProblemDetection){ if (fMonitor != null && fMonitor.isCanceled()) return; IProblemRequestor problemRequestor = workingCopy.problemRequestor; @@ -67,11 +113,11 @@ public class ReconcileWorkingCopyOperation extends JavaModelOperation { } // register the deltas - if (deltaBuilder != null){ - if ((deltaBuilder.delta != null) && (deltaBuilder.delta.getAffectedChildren().length > 0)) { - addReconcileDelta(workingCopy, deltaBuilder.delta); - } - } +// if (deltaBuilder != null){ +// if ((deltaBuilder.delta != null) && (deltaBuilder.delta.getAffectedChildren().length > 0)) { +// addReconcileDelta(workingCopy, deltaBuilder.delta); +// } +// } } finally { if (fMonitor != null) fMonitor.done(); }