Attachment 118604 Details for Bug 256298 – Fix

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Fix

patch.txt (text/plain), 4.39 KB, created by Dani Megert

on 2008-11-24 11:21:28 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Dani Megert

Created: 2008-11-24 11:21:28 EST

Size: 4.39 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.ui
>Index: src/org/eclipse/pde/internal/ui/editor/PDEFormTextEditorContributor.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEFormTextEditorContributor.java,v
>retrieving revision 1.6
>diff -u -r1.6 PDEFormTextEditorContributor.java
>--- src/org/eclipse/pde/internal/ui/editor/PDEFormTextEditorContributor.java	16 Jan 2008 17:07:52 -0000	1.6
>+++ src/org/eclipse/pde/internal/ui/editor/PDEFormTextEditorContributor.java	24 Nov 2008 16:20:16 -0000
>@@ -61,13 +61,13 @@
> 
> 			ITextEditor textEditor = (part instanceof ITextEditor) ? (ITextEditor) part : null;
> 			if (fCorrectionAssist != null)
>-				fCorrectionAssist.setAction(getAction(textEditor, ITextEditorActionConstants.QUICK_ASSIST)); //$NON-NLS-1$
>+				fCorrectionAssist.setAction(getAction(textEditor, ITextEditorActionConstants.QUICK_ASSIST));
> 			if (fHyperlinkAction != null)
> 				fHyperlinkAction.setTextEditor(textEditor);
> 			if (fFormatAction != null)
> 				fFormatAction.setTextEditor(textEditor);
> 			if (fContentAssist != null)
>-				fContentAssist.setAction(getAction(textEditor, "ContentAssist")); //$NON-NLS-1$
>+				fContentAssist.setAction(getAction(textEditor, ITextEditorActionConstants.CONTENT_ASSIST));
> 		}
> 	}
> 
>Index: src/org/eclipse/pde/internal/ui/editor/PDESourcePage.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDESourcePage.java,v
>retrieving revision 1.82
>diff -u -r1.82 PDESourcePage.java
>--- src/org/eclipse/pde/internal/ui/editor/PDESourcePage.java	30 Jun 2008 17:29:23 -0000	1.82
>+++ src/org/eclipse/pde/internal/ui/editor/PDESourcePage.java	24 Nov 2008 16:20:16 -0000
>@@ -15,12 +15,11 @@
> import org.eclipse.core.resources.IMarker;
> import org.eclipse.core.runtime.CoreException;
> import org.eclipse.jdt.ui.JavaUI;
>-import org.eclipse.jface.action.IAction;
> import org.eclipse.jface.action.IMenuManager;
> import org.eclipse.jface.preference.IPreferenceStore;
> import org.eclipse.jface.text.IDocument;
> import org.eclipse.jface.text.ITextSelection;
>-import org.eclipse.jface.text.source.*;
>+import org.eclipse.jface.text.source.ISourceViewer;
> import org.eclipse.jface.viewers.*;
> import org.eclipse.pde.core.IBaseModel;
> import org.eclipse.pde.internal.core.text.*;
>@@ -394,8 +393,6 @@
> 			PDEFormTextEditorContributor textContributor = (PDEFormTextEditorContributor) contributor;
> 			setAction(PDEActionConstants.OPEN, textContributor.getHyperlinkAction());
> 			setAction(PDEActionConstants.FORMAT, textContributor.getFormatAction());
>-			if (textContributor.supportsContentAssist())
>-				createContentAssistAction();
> 		}
> 
> 		// Create the quick outline action
>@@ -416,13 +413,6 @@
> 		setAction(PDEActionConstants.COMMAND_ID_QUICK_OUTLINE, action);
> 	}
> 
>-	private void createContentAssistAction() {
>-		IAction contentAssist = new ContentAssistAction(getBundleForConstructedKeys(), "ContentAssistProposal.", this); //$NON-NLS-1$
>-		contentAssist.setActionDefinitionId(ITextEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS);
>-		setAction("ContentAssist", contentAssist); //$NON-NLS-1$
>-		markAsStateDependentAction("ContentAssist", true); //$NON-NLS-1$
>-	}
>-
> 	public final void selectionChanged(SelectionChangedEvent event) {
> 		if (event.getSource() == getSelectionProvider())
> 			return;
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/META-INF/MANIFEST.MF,v
>retrieving revision 1.66
>diff -u -r1.66 MANIFEST.MF
>--- META-INF/MANIFEST.MF	7 Nov 2008 15:46:43 -0000	1.66
>+++ META-INF/MANIFEST.MF	24 Nov 2008 16:20:16 -0000
>@@ -81,8 +81,8 @@
>  org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)",
>  org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
>  org.eclipse.ui.views;bundle-version="[3.2.0,4.0.0)",
>- org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
>- org.eclipse.ui.workbench.texteditor;bundle-version="[3.2.0,4.0.0)",
>+ org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)",
>+ org.eclipse.ui.workbench.texteditor;bundle-version="[3.5.0,4.0.0)",
>  org.eclipse.ui.editors;bundle-version="[3.2.0,4.0.0)",
>  org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)",
>  org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",

Actions: View | Diff

Attachments on bug 256298: 118604