Attachment 174876 Details for Bug 320492 – Editor tool bar contribution patch v1

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

[patch] Editor tool bar contribution patch v1

bug3320492-patch-v1.txt (text/plain), 2.53 KB, created by Remy Suen

on 2010-07-21 11:59:19 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Remy Suen

Created: 2010-07-21 11:59:19 EDT

Size: 2.53 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.e4.ui.workbench.renderers.swt
>Index: src/org/eclipse/e4/ui/workbench/renderers/swt/ToolBarRenderer.java
>===================================================================
>RCS file: /cvsroot/eclipse/e4/org.eclipse.e4.ui/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ToolBarRenderer.java,v
>retrieving revision 1.5
>diff -u -r1.5 ToolBarRenderer.java
>--- src/org/eclipse/e4/ui/workbench/renderers/swt/ToolBarRenderer.java	14 Jul 2010 20:21:23 -0000	1.5
>+++ src/org/eclipse/e4/ui/workbench/renderers/swt/ToolBarRenderer.java	21 Jul 2010 15:57:26 -0000
>@@ -74,7 +74,7 @@
> 		return intermediate;
> 	}
> 
>-	void createToolbar(final MUIElement element, Composite intermediate) {
>+	ToolBar createToolbar(final MUIElement element, Composite intermediate) {
> 		int orientation = getOrientation(element);
> 		RowLayout layout = RowLayoutFactory.fillDefaults().wrap(false)
> 				.spacing(0).type(orientation).create();
>@@ -86,7 +86,8 @@
> 		ToolBar separatorToolBar = new ToolBar(intermediate, orientation
> 				| SWT.WRAP | SWT.FLAT | SWT.RIGHT);
> 		new ToolItem(separatorToolBar, SWT.SEPARATOR);
>-		new ToolBar(intermediate, orientation | SWT.WRAP | SWT.FLAT | SWT.RIGHT);
>+		return new ToolBar(intermediate, orientation | SWT.WRAP | SWT.FLAT
>+				| SWT.RIGHT);
> 	}
> 
> 	int getOrientation(final MUIElement element) {
>@@ -108,7 +109,7 @@
> 		}
> 		ToolBar toolbar = findToolbar(intermediate);
> 		if (toolbar == null) {
>-			createToolbar(childElement.getParent(), intermediate);
>+			toolbar = createToolbar(childElement.getParent(), intermediate);
> 		}
> 		return toolbar;
> 	}
>#P org.eclipse.ui.workbench
>Index: Eclipse UI/org/eclipse/ui/internal/EditorReference.java
>===================================================================
>RCS file: /cvsroot/eclipse/e4/org.eclipse.e4.compatibility/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorReference.java,v
>retrieving revision 1.15
>diff -u -r1.15 EditorReference.java
>--- Eclipse UI/org/eclipse/ui/internal/EditorReference.java	14 Jul 2010 15:44:33 -0000	1.15
>+++ Eclipse UI/org/eclipse/ui/internal/EditorReference.java	21 Jul 2010 15:57:27 -0000
>@@ -285,7 +285,7 @@
> 		}
> 
> 		// Create a new action bar set.
>-		EditorActionBars actionBars = new EditorActionBars(page, site, type);
>+		EditorActionBars actionBars = new EditorActionBars(page, page.getWorkbenchWindow(), type);
> 		actionBars.addRef();
> 		if (candidates == null) {
> 			candidates = new HashSet<EditorActionBars>(3);

Actions: View | Diff

Attachments on bug 320492: 174876