From 93740b531682ce9662b5d12f830e6ec3f84c72b9 Mon Sep 17 00:00:00 2001 From: Thomas Fletcher Date: Wed, 19 Apr 2006 21:19:27 +0000 Subject: [PATCH] Updated reconciler usage to make use of new MonoReconciler class and removed CReconciler. Patch contributed by Anton Leherbauer PR 130089 --- .../eclipse/cdt/internal/ui/text/CReconciler.java | 15 --------------- .../ui/text/CSourceViewerConfiguration.java | 15 ++------------- 2 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CReconciler.java diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CReconciler.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CReconciler.java deleted file mode 100644 index e32c8081d4c..00000000000 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CReconciler.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.eclipse.cdt.internal.ui.text; - -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.reconciler.DirtyRegion; -import org.eclipse.jface.text.reconciler.Reconciler; - -public class CReconciler extends Reconciler { - - protected void process(DirtyRegion dirtyRegion) { - if(dirtyRegion != null) { - getReconcilingStrategy(IDocument.DEFAULT_CONTENT_TYPE).reconcile(dirtyRegion, null); - } - } - -} diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java index 7355beb9ea9..b72ca79d991 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java @@ -44,7 +44,7 @@ import org.eclipse.jface.text.information.InformationPresenter; import org.eclipse.jface.text.presentation.IPresentationReconciler; import org.eclipse.jface.text.presentation.PresentationReconciler; import org.eclipse.jface.text.reconciler.IReconciler; -import org.eclipse.jface.text.reconciler.Reconciler; +import org.eclipse.jface.text.reconciler.MonoReconciler; import org.eclipse.jface.text.rules.DefaultDamagerRepairer; import org.eclipse.jface.text.rules.RuleBasedScanner; import org.eclipse.jface.text.source.IAnnotationHover; @@ -222,21 +222,10 @@ public class CSourceViewerConfiguration extends TextSourceViewerConfiguration { */ public IReconciler getReconciler(ISourceViewer sourceViewer) { if (fEditor != null && fEditor.isEditable()) { - Reconciler reconciler= new CReconciler() { - protected void initialProcess() { - // prevent case where getDocument() returns null - // and causes exception in initialProcess() - // PR 63890 - IDocument doc = getDocument(); - if (doc != null) - super.initialProcess(); - } - }; //Delay changed and non-incremental reconciler used due to //PR 130089 + MonoReconciler reconciler= new MonoReconciler(new CReconcilingStrategy(fEditor), false); reconciler.setDelay(500); - reconciler.setIsIncrementalReconciler(false); - reconciler.setReconcilingStrategy(new CReconcilingStrategy(fEditor), IDocument.DEFAULT_CONTENT_TYPE); return reconciler; } return null;