X-Git-Url: http://secure.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/java/JavaReconcilingStrategy.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/java/JavaReconcilingStrategy.java
index 8294154..fe21bcd 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/java/JavaReconcilingStrategy.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/java/JavaReconcilingStrategy.java
@@ -24,184 +24,194 @@ import org.eclipse.jface.text.source.IAnnotationModel;
 import org.eclipse.ui.texteditor.IDocumentProvider;
 import org.eclipse.ui.texteditor.ITextEditor;
 
-public class JavaReconcilingStrategy implements IReconcilingStrategy, IReconcilingStrategyExtension {
-
-  private ITextEditor fEditor;
-
-  private IWorkingCopyManager fManager;
-
-  private IDocumentProvider fDocumentProvider;
-
-  private IProgressMonitor fProgressMonitor;
-
-  private boolean fNotify = true;
-
-  private IJavaReconcilingListener fJavaReconcilingListener;
-
-  private boolean fIsJavaReconcilingListener;
-
-  public JavaReconcilingStrategy(ITextEditor editor) {
-    fEditor = editor;
-    fManager = PHPeclipsePlugin.getDefault().getWorkingCopyManager();
-    fDocumentProvider = PHPeclipsePlugin.getDefault().getCompilationUnitDocumentProvider();
-    fIsJavaReconcilingListener = fEditor instanceof IJavaReconcilingListener;
-    if (fIsJavaReconcilingListener)
-      fJavaReconcilingListener = (IJavaReconcilingListener) fEditor;
-  }
-
-  private IProblemRequestorExtension getProblemRequestorExtension() {
-    IAnnotationModel model = fDocumentProvider.getAnnotationModel(fEditor.getEditorInput());
-    if (model instanceof IProblemRequestorExtension)
-      return (IProblemRequestorExtension) model;
-    return null;
-  }
-
-  private void reconcile() {
-    //    // try {
-    //
-    //    /* fix for missing cancel flag communication */
-    //    IProblemRequestorExtension extension = getProblemRequestorExtension();
-    //    if (extension != null)
-    //      extension.setProgressMonitor(fProgressMonitor);
-    //
-    //    // reconcile
-    //// synchronized (unit) {
-    //// unit.reconcile(true, fProgressMonitor);
-    //// }
-    //
-    //    Parser parser = new Parser();
-    //    parser.initializeScanner();
-    //    // actualParser.setFileToParse(fileToParse);
-    //    String text = fEditor.getDocumentProvider().getDocument(fEditor.getEditorInput()).get();
-    //    parser.init(text);
-    //    parser.reportSyntaxError();
-    //// checkAndReportBracketAnomalies(parser.problemReporter());
-    //
-    //    /* fix for missing cancel flag communication */
-    //    if (extension != null)
-    //      extension.setProgressMonitor(null);
-    //
-    //    // update participants
-    //    try {
-    //      if (fEditor instanceof IReconcilingParticipant && fNotify && !fProgressMonitor.isCanceled()) {
-    //        IReconcilingParticipant p = (IReconcilingParticipant) fEditor;
-    //        p.reconciled();
-    //      }
-    //    } finally {
-    //      fNotify = true;
-    //    }
-
-    // JDT implementation:
-    try {
-      ICompilationUnit unit = fManager.getWorkingCopy(fEditor.getEditorInput());
-      if (unit != null) {
-        try {
-
-          /* fix for missing cancel flag communication */
-          IProblemRequestorExtension extension = getProblemRequestorExtension();
-          if (extension != null)
-            extension.setProgressMonitor(fProgressMonitor);
-
-          // reconcile
-          synchronized (unit) {
-            unit.reconcile(true, fProgressMonitor);
-          }
-
-          /* fix for missing cancel flag communication */
-          if (extension != null)
-            extension.setProgressMonitor(null);
-
-          // update participants
-          try {
-            if (fEditor instanceof IReconcilingParticipant && fNotify && !fProgressMonitor.isCanceled()) {
-              IReconcilingParticipant p = (IReconcilingParticipant) fEditor;
-              p.reconciled();
-            }
-          } finally {
-            fNotify = true;
-          }
-
-        } catch (JavaModelException x) {
-          // swallow exception
-        }
-      }
-    } finally {
-      // Always notify listeners, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=55969 for the final solution
-      try {
-        if (fIsJavaReconcilingListener) {
-          IProgressMonitor pm = fProgressMonitor;
-          if (pm == null)
-            pm = new NullProgressMonitor();
-          fJavaReconcilingListener.reconciled(null, !fNotify, pm);
-        }
-      } finally {
-        fNotify = true;
-      }
-
-    }
-  }
-
-  /*
-   * @see IReconcilingStrategy#reconcile(IRegion)
-   */
-  public void reconcile(IRegion partition) {
-    reconcile();
-  }
-
-  /*
-   * @see IReconcilingStrategy#reconcile(DirtyRegion, IRegion)
-   */
-  public void reconcile(DirtyRegion dirtyRegion, IRegion subRegion) {
-    reconcile();
-  }
-
-  /*
-   * @see IReconcilingStrategy#setDocument(IDocument)
-   */
-  public void setDocument(IDocument document) {
-  }
-
-  /*
-   * @see IReconcilingStrategyExtension#setProgressMonitor(IProgressMonitor)
-   */
-  public void setProgressMonitor(IProgressMonitor monitor) {
-    fProgressMonitor = monitor;
-  }
-
-  /*
-   * @see IReconcilingStrategyExtension#initialReconcile()
-   */
-  public void initialReconcile() {
-    reconcile();
-  }
-
-  /**
-   * Tells this strategy whether to inform its participants.
-   * 
-   * @param notify
-   *          <code>true</code> if participant should be notified
-   */
-  public void notifyParticipants(boolean notify) {
-    fNotify = notify;
-  }
-
-  /**
-   * Tells this strategy whether to inform its listeners.
-   * 
-   * @param notify
-   *          <code>true</code> if listeners should be notified
-   */
-  public void notifyListeners(boolean notify) {
-    fNotify = notify;
-  }
-
-  /**
-   * Called before reconciling is started.
-   * 
-   * @since 3.0
-   */
-  public void aboutToBeReconciled() {
-    if (fIsJavaReconcilingListener)
-      fJavaReconcilingListener.aboutToBeReconciled();
-  }
+public class JavaReconcilingStrategy implements IReconcilingStrategy,
+		IReconcilingStrategyExtension {
+
+	private ITextEditor fEditor;
+
+	private IWorkingCopyManager fManager;
+
+	private IDocumentProvider fDocumentProvider;
+
+	private IProgressMonitor fProgressMonitor;
+
+	private boolean fNotify = true;
+
+	private IJavaReconcilingListener fJavaReconcilingListener;
+
+	private boolean fIsJavaReconcilingListener;
+
+	public JavaReconcilingStrategy(ITextEditor editor) {
+		fEditor = editor;
+		fManager = PHPeclipsePlugin.getDefault().getWorkingCopyManager();
+		fDocumentProvider = PHPeclipsePlugin.getDefault()
+				.getCompilationUnitDocumentProvider();
+		fIsJavaReconcilingListener = fEditor instanceof IJavaReconcilingListener;
+		if (fIsJavaReconcilingListener)
+			fJavaReconcilingListener = (IJavaReconcilingListener) fEditor;
+	}
+
+	private IProblemRequestorExtension getProblemRequestorExtension() {
+		IAnnotationModel model = fDocumentProvider.getAnnotationModel(fEditor
+				.getEditorInput());
+		if (model instanceof IProblemRequestorExtension)
+			return (IProblemRequestorExtension) model;
+		return null;
+	}
+
+	private void reconcile() {
+		// // try {
+		//
+		// /* fix for missing cancel flag communication */
+		// IProblemRequestorExtension extension =
+		// getProblemRequestorExtension();
+		// if (extension != null)
+		// extension.setProgressMonitor(fProgressMonitor);
+		//
+		// // reconcile
+		// // synchronized (unit) {
+		// // unit.reconcile(true, fProgressMonitor);
+		// // }
+		//
+		// Parser parser = new Parser();
+		// parser.initializeScanner();
+		// // actualParser.setFileToParse(fileToParse);
+		// String text =
+		// fEditor.getDocumentProvider().getDocument(fEditor.getEditorInput()).get();
+		// parser.init(text);
+		// parser.reportSyntaxError();
+		// // checkAndReportBracketAnomalies(parser.problemReporter());
+		//
+		// /* fix for missing cancel flag communication */
+		// if (extension != null)
+		// extension.setProgressMonitor(null);
+		//
+		// // update participants
+		// try {
+		// if (fEditor instanceof IReconcilingParticipant && fNotify &&
+		// !fProgressMonitor.isCanceled()) {
+		// IReconcilingParticipant p = (IReconcilingParticipant) fEditor;
+		// p.reconciled();
+		// }
+		// } finally {
+		// fNotify = true;
+		// }
+
+		// JDT implementation:
+		try {
+			ICompilationUnit unit = fManager.getWorkingCopy(fEditor
+					.getEditorInput());
+			if (unit != null) {
+				try {
+
+					/* fix for missing cancel flag communication */
+					IProblemRequestorExtension extension = getProblemRequestorExtension();
+					if (extension != null)
+						extension.setProgressMonitor(fProgressMonitor);
+
+					// reconcile
+					synchronized (unit) {
+						unit.reconcile(true, fProgressMonitor);
+					}
+
+					/* fix for missing cancel flag communication */
+					if (extension != null)
+						extension.setProgressMonitor(null);
+
+					// update participants
+					try {
+						if (fEditor instanceof IReconcilingParticipant
+								&& fNotify && !fProgressMonitor.isCanceled()) {
+							IReconcilingParticipant p = (IReconcilingParticipant) fEditor;
+							p.reconciled();
+						}
+					} finally {
+						fNotify = true;
+					}
+
+				} catch (JavaModelException x) {
+					// swallow exception
+				}
+			}
+		} finally {
+			// Always notify listeners, see
+			// https://bugs.eclipse.org/bugs/show_bug.cgi?id=55969 for the final
+			// solution
+			try {
+				if (fIsJavaReconcilingListener) {
+					IProgressMonitor pm = fProgressMonitor;
+					if (pm == null)
+						pm = new NullProgressMonitor();
+					fJavaReconcilingListener.reconciled(null, !fNotify, pm);
+				}
+			} finally {
+				fNotify = true;
+			}
+
+		}
+	}
+
+	/*
+	 * @see IReconcilingStrategy#reconcile(IRegion)
+	 */
+	public void reconcile(IRegion partition) {
+		reconcile();
+	}
+
+	/*
+	 * @see IReconcilingStrategy#reconcile(DirtyRegion, IRegion)
+	 */
+	public void reconcile(DirtyRegion dirtyRegion, IRegion subRegion) {
+		reconcile();
+	}
+
+	/*
+	 * @see IReconcilingStrategy#setDocument(IDocument)
+	 */
+	public void setDocument(IDocument document) {
+	}
+
+	/*
+	 * @see IReconcilingStrategyExtension#setProgressMonitor(IProgressMonitor)
+	 */
+	public void setProgressMonitor(IProgressMonitor monitor) {
+		fProgressMonitor = monitor;
+	}
+
+	/*
+	 * @see IReconcilingStrategyExtension#initialReconcile()
+	 */
+	public void initialReconcile() {
+		reconcile();
+	}
+
+	/**
+	 * Tells this strategy whether to inform its participants.
+	 * 
+	 * @param notify
+	 *            <code>true</code> if participant should be notified
+	 */
+	public void notifyParticipants(boolean notify) {
+		fNotify = notify;
+	}
+
+	/**
+	 * Tells this strategy whether to inform its listeners.
+	 * 
+	 * @param notify
+	 *            <code>true</code> if listeners should be notified
+	 */
+	public void notifyListeners(boolean notify) {
+		fNotify = notify;
+	}
+
+	/**
+	 * Called before reconciling is started.
+	 * 
+	 * @since 3.0
+	 */
+	public void aboutToBeReconciled() {
+		if (fIsJavaReconcilingListener)
+			fJavaReconcilingListener.aboutToBeReconciled();
+	}
 }
\ No newline at end of file