Attachment 148417 Details for Bug 229352 – Patch to fix bug described above

[patch] Patch to fix bug described above

build_with_makefilesourceconfiguration_rev_1.14.2.1.patch (text/plain), 3.00 KB, created by Jordy Potman on 2007-02-20 15:50:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jordy Potman

Created: 2007-02-20 15:50:45 UTC

Size: 3.00 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P com.redhat.eclipse.cdt.autotools
>Index: src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileSourceConfiguration.java
>===================================================================
>RCS file: /cvs/eclipse/autotools/com.redhat.eclipse.cdt.autotools/src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileSourceConfiguration.java,v
>retrieving revision 1.5
>diff -u -r1.5 AutomakefileSourceConfiguration.java
>--- src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileSourceConfiguration.java	2 Feb 2007 18:58:15 -0000	1.5
>+++ src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakefileSourceConfiguration.java	20 Feb 2007 13:33:47 -0000
>@@ -19,6 +19,7 @@
> import org.eclipse.cdt.make.internal.ui.editor.MakefileSourceConfiguration;
> import org.eclipse.cdt.make.internal.ui.text.makefile.MakefilePartitionScanner;
> import org.eclipse.core.runtime.NullProgressMonitor;
>+import org.eclipse.jface.preference.IPreferenceStore;
> import org.eclipse.jface.text.IDocument;
> import org.eclipse.jface.text.ITextHover;
> import org.eclipse.jface.text.contentassist.ContentAssistant;
>@@ -42,12 +43,12 @@
> 	/**
> 	 * Constructor for MakeConfiguration
> 	 */
>-	public AutomakefileSourceConfiguration() {
>-		super(null);
>+	public AutomakefileSourceConfiguration(IPreferenceStore preferenceStore) {
>+		super(preferenceStore, null);
> 	}
> 	
>-	public AutomakefileSourceConfiguration(AutomakeEditor editor) {
>-		super(editor);
>+	public AutomakefileSourceConfiguration(IPreferenceStore preferenceStore, AutomakeEditor editor) {
>+		super(preferenceStore, editor);
> 		this.editor = editor;
> 	}
> 	
>Index: src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java
>===================================================================
>RCS file: /cvs/eclipse/autotools/com.redhat.eclipse.cdt.autotools/src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java,v
>retrieving revision 1.6
>diff -u -r1.6 AutomakeEditor.java
>--- src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java	31 Jan 2007 21:25:55 -0000	1.6
>+++ src/com/redhat/eclipse/cdt/autotools/editors/automake/AutomakeEditor.java	20 Feb 2007 13:33:47 -0000
>@@ -40,8 +40,6 @@
> 	 * @see org.eclipse.ui.texteditor.AbstractDecoratedTextEditor#initializeEditor()
> 	 */
> 	protected void initializeEditor() {
>-		sourceViewerConfiguration = new AutomakefileSourceConfiguration(this);
>-		setSourceViewerConfiguration(sourceViewerConfiguration);
> 		setRangeIndicator(new DefaultRangeIndicator());
> 		setEditorContextMenuId("#MakefileEditorContext"); //$NON-NLS-1$
> 		setRulerContextMenuId("#MakefileRulerContext"); //$NON-NLS-1$
>@@ -51,6 +49,8 @@
> 		stores[1] = EditorsUI.getPreferenceStore();
> 		ChainedPreferenceStore chainedStore = new ChainedPreferenceStore(stores);
> 		setPreferenceStore(chainedStore);
>+		sourceViewerConfiguration = new AutomakefileSourceConfiguration(chainedStore, this);
>+		setSourceViewerConfiguration(sourceViewerConfiguration);
> 	}
> 	
> 	public AutomakeDocumentProvider getAutomakefileDocumentProvider() {

Actions: View | Diff

Attachments on bug 229352: 148417