From 5cada175131a482f7f4f71d7169c601ed9d7bc2f Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Mon, 8 Sep 2003 20:11:18 +0000 Subject: [PATCH] Remove obsolete constant --- .../internal/ui/editor/MakefileEditor.java | 4 -- .../editor/MakefileSourceConfiguration.java | 72 ++++++++++--------- 2 files changed, 39 insertions(+), 37 deletions(-) diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileEditor.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileEditor.java index d6d0a3320c0..8f6047cb071 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileEditor.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileEditor.java @@ -31,10 +31,6 @@ import org.eclipse.ui.texteditor.TextOperationAction; import org.eclipse.ui.views.contentoutline.IContentOutlinePage; public class MakefileEditor extends TextEditor { - public final static String MAKE_COMMENT = "make_comment"; //$NON-NLS-1$ - public final static String MAKE_KEYWORD = "make_keyword"; //$NON-NLS-1$ - public final static String MAKE_MACRO_VAR = "macro_var"; //$NON-NLS-1$ - public final static String MAKE_META_DATA = "meta_data"; //$NON-NLS-1$ /** * The page that shows the outline. diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileSourceConfiguration.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileSourceConfiguration.java index 54d9c4f9ec1..5a0829f5b1f 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileSourceConfiguration.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileSourceConfiguration.java @@ -58,31 +58,37 @@ public class MakefileSourceConfiguration extends SourceViewerConfiguration { public String[] getConfiguredContentTypes(ISourceViewer v) { return new String[] { IDocument.DEFAULT_CONTENT_TYPE, - MakefileEditor.MAKE_COMMENT, - MakefileEditor.MAKE_KEYWORD, - MakefileEditor.MAKE_MACRO_VAR, - MakefileEditor.MAKE_META_DATA - }; + MakefilePartitionScanner.MAKEFILE_COMMENT,//MakefileEditor.MAKE_COMMENT, + MakefilePartitionScanner.MAKEFILE_IF_BLOCK,//MakefileEditor.MAKE_KEYWORD, + MakefilePartitionScanner.MAKEFILE_DEF_BLOCK, + MakefilePartitionScanner.MAKEFILE_INCLUDE_BLOCK, + MakefilePartitionScanner.MAKEFILE_MACRO_ASSIGNEMENT, //MakefileEditor.MAKE_MACRO_VAR, + };//MakefileEditor.MAKE_META_DATA }; } - /** - * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getContentAssistant(ISourceViewer) - */ - public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) { - ContentAssistant assistant = new ContentAssistant(); - assistant.setContentAssistProcessor(new MakefileCompletionProcessor(fEditor), IDocument.DEFAULT_CONTENT_TYPE); - assistant.setContentAssistProcessor(new MakefileCompletionProcessor(fEditor), MakefileEditor.MAKE_MACRO_VAR); - assistant.enableAutoActivation(true); - assistant.setAutoActivationDelay(500); - assistant.setProposalPopupOrientation(IContentAssistant.CONTEXT_INFO_BELOW); - assistant.setContextInformationPopupOrientation(IContentAssistant.CONTEXT_INFO_BELOW); - //Set to Carolina blue - assistant.setContextInformationPopupBackground(getColorManager().getColor(new RGB(0, 191, 255))); - - return assistant; - } + /** + * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getContentAssistant(ISourceViewer) + */ + public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) { + ContentAssistant assistant = new ContentAssistant(); + assistant.setContentAssistProcessor(new MakefileCompletionProcessor(fEditor), IDocument.DEFAULT_CONTENT_TYPE); + assistant.setContentAssistProcessor(new MakefileCompletionProcessor(fEditor), MakefilePartitionScanner.MAKEFILE_COMMENT); + assistant.setContentAssistProcessor(new MakefileCompletionProcessor(fEditor), MakefilePartitionScanner.MAKEFILE_DEF_BLOCK); + assistant.setContentAssistProcessor(new MakefileCompletionProcessor(fEditor), MakefilePartitionScanner.MAKEFILE_IF_BLOCK); + assistant.setContentAssistProcessor(new MakefileCompletionProcessor(fEditor), MakefilePartitionScanner.MAKEFILE_INCLUDE_BLOCK); + assistant.setContentAssistProcessor(new MakefileCompletionProcessor(fEditor), MakefilePartitionScanner.MAKEFILE_MACRO_ASSIGNEMENT); + assistant.enableAutoActivation(true); + assistant.setAutoActivationDelay(500); + + assistant.setProposalPopupOrientation(IContentAssistant.CONTEXT_INFO_BELOW); + assistant.setContextInformationPopupOrientation(IContentAssistant.CONTEXT_INFO_BELOW); + //Set to Carolina blue + assistant.setContextInformationPopupBackground(getColorManager().getColor(new RGB(0, 191, 255))); + + return assistant; + } protected IMakefileColorManager getColorManager() { if (null == colorManager) @@ -107,28 +113,28 @@ public class MakefileSourceConfiguration extends SourceViewerConfiguration { dr = new DefaultDamagerRepairer(getCodeScanner()); dr = new DefaultDamagerRepairer(getCodeScanner()); - reconciler.setDamager(dr, MakefilePartitionScanner.MAKE_COMMENT); - reconciler.setRepairer(dr, MakefilePartitionScanner.MAKE_COMMENT); + reconciler.setDamager(dr, MakefilePartitionScanner.MAKEFILE_COMMENT); + reconciler.setRepairer(dr, MakefilePartitionScanner.MAKEFILE_COMMENT); dr = new DefaultDamagerRepairer(getCodeScanner()); - reconciler.setDamager(dr, MakefilePartitionScanner.MAKE_MACRO_ASSIGNEMENT); - reconciler.setRepairer(dr, MakefilePartitionScanner.MAKE_MACRO_ASSIGNEMENT); + reconciler.setDamager(dr, MakefilePartitionScanner.MAKEFILE_MACRO_ASSIGNEMENT); + reconciler.setRepairer(dr, MakefilePartitionScanner.MAKEFILE_MACRO_ASSIGNEMENT); dr = new DefaultDamagerRepairer(getCodeScanner()); - reconciler.setDamager(dr, MakefilePartitionScanner.MAKE_INCLUDE_BLOCK); - reconciler.setRepairer(dr, MakefilePartitionScanner.MAKE_INCLUDE_BLOCK); + reconciler.setDamager(dr, MakefilePartitionScanner.MAKEFILE_INCLUDE_BLOCK); + reconciler.setRepairer(dr, MakefilePartitionScanner.MAKEFILE_INCLUDE_BLOCK); dr = new DefaultDamagerRepairer(getCodeScanner()); - reconciler.setDamager(dr, MakefilePartitionScanner.MAKE_IF_BLOCK); - reconciler.setRepairer(dr, MakefilePartitionScanner.MAKE_IF_BLOCK); + reconciler.setDamager(dr, MakefilePartitionScanner.MAKEFILE_IF_BLOCK); + reconciler.setRepairer(dr, MakefilePartitionScanner.MAKEFILE_IF_BLOCK); dr = new DefaultDamagerRepairer(getCodeScanner()); - reconciler.setDamager(dr, MakefilePartitionScanner.MAKE_DEF_BLOCK); - reconciler.setRepairer(dr, MakefilePartitionScanner.MAKE_DEF_BLOCK); + reconciler.setDamager(dr, MakefilePartitionScanner.MAKEFILE_DEF_BLOCK); + reconciler.setRepairer(dr, MakefilePartitionScanner.MAKEFILE_DEF_BLOCK); dr = new DefaultDamagerRepairer(getCodeScanner()); - reconciler.setDamager(dr, MakefilePartitionScanner.MAKE_OTHER); - reconciler.setRepairer(dr, MakefilePartitionScanner.MAKE_OTHER); + reconciler.setDamager(dr, MakefilePartitionScanner.MAKEFILE_OTHER); + reconciler.setRepairer(dr, MakefilePartitionScanner.MAKEFILE_OTHER); return reconciler; }