From 958906d8085d4996a46489214db95c2402bbab2e Mon Sep 17 00:00:00 2001 From: Sebastien Marineau Date: Fri, 9 Aug 2002 02:31:39 +0000 Subject: [PATCH] 2.0 cleanup --- .../asm/AsmSourceViewerConfiguration.java | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmSourceViewerConfiguration.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmSourceViewerConfiguration.java index b690d66ec64..4101c8f1381 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmSourceViewerConfiguration.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmSourceViewerConfiguration.java @@ -12,7 +12,7 @@ import org.eclipse.jface.text.TextAttribute; import org.eclipse.jface.text.TextPresentation; import org.eclipse.jface.text.presentation.IPresentationReconciler; import org.eclipse.jface.text.presentation.PresentationReconciler; -import org.eclipse.jface.text.rules.RuleBasedDamagerRepairer; +import org.eclipse.jface.text.rules.DefaultDamagerRepairer; import org.eclipse.jface.text.source.ISourceViewer; import org.eclipse.jface.text.source.SourceViewerConfiguration; import org.eclipse.swt.custom.StyleRange; @@ -45,26 +45,13 @@ public class AsmSourceViewerConfiguration extends SourceViewerConfiguration { - RuleBasedDamagerRepairer dr= new RuleBasedDamagerRepairer( - /* - * Override addRange in the default RuleBasedDamagerRepairer, it forgets to pass in text style - * More code here only until we move to 2.0... - */ - fTextTools.getCodeScanner(), - new TextAttribute(manager.getColor(ICColorConstants.C_DEFAULT))) { - protected void addRange(TextPresentation presentation, int offset, int length, TextAttribute attr) { - presentation.addStyleRange(new StyleRange(offset, length, attr.getForeground(), attr.getBackground(), attr.getStyle())); - } - }; + DefaultDamagerRepairer dr= new DefaultDamagerRepairer(fTextTools.getCodeScanner()); reconciler.setDamager(dr, IDocument.DEFAULT_CONTENT_TYPE); reconciler.setRepairer(dr, IDocument.DEFAULT_CONTENT_TYPE); - dr= new RuleBasedDamagerRepairer( - null, - new TextAttribute(manager.getColor(ICColorConstants.C_MULTI_LINE_COMMENT)) - ); + dr= new DefaultDamagerRepairer(fTextTools.getCodeScanner()); reconciler.setDamager(dr, AsmPartitionScanner.C_MULTILINE_COMMENT); reconciler.setRepairer(dr, AsmPartitionScanner.C_MULTILINE_COMMENT);