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 cf966f9..09ea48e 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 @@ -10,16 +10,14 @@ *******************************************************************************/ package net.sourceforge.phpdt.internal.core; -import java.util.Map; - import net.sourceforge.phpdt.core.IJavaElement; import net.sourceforge.phpdt.core.IJavaModelStatus; import net.sourceforge.phpdt.core.IJavaModelStatusConstants; import net.sourceforge.phpdt.core.IProblemRequestor; import net.sourceforge.phpdt.core.JavaModelException; import net.sourceforge.phpdt.core.WorkingCopyOwner; +import net.sourceforge.phpdt.internal.compiler.ast.CompilationUnitDeclaration; import net.sourceforge.phpdt.internal.core.util.Util; -import net.sourceforge.phpeclipse.internal.compiler.ast.CompilationUnitDeclaration; /** * Reconcile a working copy and signal the changes through a delta. @@ -30,7 +28,7 @@ public class ReconcileWorkingCopyOperation extends JavaModelOperation { int astLevel; boolean forceProblemDetection; WorkingCopyOwner workingCopyOwner; -// org.eclipse.jdt.core.dom.CompilationUnit ast; +// net.sourceforge.phpdt.core.dom.CompilationUnit ast; public ReconcileWorkingCopyOperation(IJavaElement workingCopy, boolean forceProblemDetection) { super(new IJavaElement[] {workingCopy}); @@ -50,7 +48,7 @@ public class ReconcileWorkingCopyOperation extends JavaModelOperation { // protected void executeOperation() throws JavaModelException { // if (fMonitor != null){ // if (fMonitor.isCanceled()) return; -// fMonitor.beginTask(Util.bind("element.reconciling"), 10); //$NON-NLS-1$ +// fMonitor.beginTask(ProjectPrefUtil.bind("element.reconciling"), 10); //$NON-NLS-1$ // } // // WorkingCopy workingCopy = getWorkingCopy(); @@ -126,7 +124,6 @@ public class ReconcileWorkingCopyOperation extends JavaModelOperation { problemRequestor.beginReporting(); char[] contents = workingCopy.getContents(); unit = CompilationUnitProblemFinder.process(workingCopy, contents, this.workingCopyOwner, problemRequestor, false/*don't cleanup cu*/, this.progressMonitor); - CompilationUnitProblemFinder.process(workingCopy, problemRequestor, progressMonitor); problemRequestor.endReporting(); }