Attachment 118165 Details for Bug 255688 – proposed patch

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

[patch] proposed patch

c_editor_patch.txt (text/plain), 4.26 KB, created by Mike Kucera

on 2008-11-18 13:25:05 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Mike Kucera

Created: 2008-11-18 13:25:05 EST

Size: 4.26 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.cdt.ui
>Index: src/org/eclipse/cdt/internal/ui/editor/CContentOutlinePage.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CContentOutlinePage.java,v
>retrieving revision 1.65.2.1
>diff -u -r1.65.2.1 CContentOutlinePage.java
>--- src/org/eclipse/cdt/internal/ui/editor/CContentOutlinePage.java	2 Oct 2008 10:57:21 -0000	1.65.2.1
>+++ src/org/eclipse/cdt/internal/ui/editor/CContentOutlinePage.java	18 Nov 2008 18:23:31 -0000
>@@ -109,12 +109,12 @@
> 	}
> 
> 	@Override
>-	protected SelectionSearchGroup createSearchActionGroup() {
>+	protected ActionGroup createSearchActionGroup() {
> 		return new SelectionSearchGroup(this);
> 	}
> 
> 	@Override
>-	protected OpenViewActionGroup createOpenViewActionGroup() {
>+	protected ActionGroup createOpenViewActionGroup() {
> 		OpenViewActionGroup ovag= new OpenViewActionGroup(this, getEditor());
> 		ovag.setEnableIncludeBrowser(true);
> 		return ovag;
>Index: src/org/eclipse/cdt/internal/ui/editor/AbstractCModelOutlinePage.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AbstractCModelOutlinePage.java,v
>retrieving revision 1.4.2.2
>diff -u -r1.4.2.2 AbstractCModelOutlinePage.java
>--- src/org/eclipse/cdt/internal/ui/editor/AbstractCModelOutlinePage.java	1 Aug 2008 10:56:35 -0000	1.4.2.2
>+++ src/org/eclipse/cdt/internal/ui/editor/AbstractCModelOutlinePage.java	18 Nov 2008 18:23:31 -0000
>@@ -206,9 +206,9 @@
> 	private IncludeGroupingAction fIncludeGroupingAction;
> 	private ToggleLinkingAction fToggleLinkingAction;
> 	private ActionGroup fMemberFilterActionGroup;
>-	private SelectionSearchGroup fSelectionSearchGroup;
>+	private ActionGroup fSelectionSearchGroup;
> 	private ActionGroup fRefactoringActionGroup;
>-	private OpenViewActionGroup fOpenViewActionGroup;
>+	private ActionGroup fOpenViewActionGroup;
> 	/**
> 	 * Custom filter action group.
> 	 * @since 3.0
>@@ -516,7 +516,7 @@
> 	 * return an ActionGroup contributing search actions or
> 	 *         <code>null</code> if search is not supported
> 	 */
>-	protected SelectionSearchGroup createSearchActionGroup() {
>+	protected ActionGroup createSearchActionGroup() {
> 		// default: no search action group
> 		return null;
> 	}
>@@ -525,7 +525,7 @@
> 	 * @return an OpenViewActionGroup contributing open view actions or
> 	 *         <code>null</code> if open view actions are not wanted
> 	 */
>-	protected OpenViewActionGroup createOpenViewActionGroup() {
>+	protected ActionGroup createOpenViewActionGroup() {
> 		// default: no open view action group
> 		return null;
> 	}
>Index: src/org/eclipse/cdt/internal/ui/editor/CEditor.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java,v
>retrieving revision 1.180.2.4
>diff -u -r1.180.2.4 CEditor.java
>--- src/org/eclipse/cdt/internal/ui/editor/CEditor.java	9 Oct 2008 12:02:48 -0000	1.180.2.4
>+++ src/org/eclipse/cdt/internal/ui/editor/CEditor.java	18 Nov 2008 18:23:31 -0000
>@@ -2156,10 +2156,10 @@
>         setAction("OpenMacroExplorer", action); //$NON-NLS-1$*/
> 
>         //Assorted action groupings
>-		fSelectionSearchGroup = new SelectionSearchGroup(this);
>+		fSelectionSearchGroup = createSelectionSearchGroup();
> 		fTextSearchGroup= new TextSearchGroup(this);
> 		fRefactoringActionGroup= new CRefactoringActionGroup(this, ITextEditorActionConstants.GROUP_EDIT);
>-		fOpenInViewGroup= new OpenViewActionGroup(this);
>+		fOpenInViewGroup= createOpenViewActionGroup();
> 		fGenerateActionGroup= new GenerateActionGroup(this, ITextEditorActionConstants.GROUP_EDIT);
> 
> 		action = getAction(ITextEditorActionConstants.SHIFT_RIGHT);
>@@ -2174,6 +2174,17 @@
> 		}
> 	}
> 
>+
>+	protected ActionGroup createSelectionSearchGroup() {
>+		return new SelectionSearchGroup(this);
>+	}
>+	
>+	protected ActionGroup createOpenViewActionGroup() {
>+		return new OpenViewActionGroup(this);
>+	}
>+	
>+
>+
> 	/**
> 	 * @see org.eclipse.ui.texteditor.AbstractTextEditor#editorContextMenuAboutToShow(org.eclipse.jface.action.IMenuManager)
> 	 */

Flags:

cdtdoug: iplog-

Actions: View | Diff

Attachments on bug 255688: 118165