Attachment 157898 Details for Bug 161693 – Patch v01

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

[patch] Patch v01

CoolbarContribVisible 01.txt (text/plain), 3.15 KB, created by Prakash Rangaraj

on 2010-02-02 08:20:47 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Prakash Rangaraj

Created: 2010-02-02 08:20:47 EST

Size: 3.15 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.tests
>Index: Eclipse UI Tests/org/eclipse/ui/tests/internal/EditorActionBarsTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/internal/EditorActionBarsTest.java,v
>retrieving revision 1.20
>diff -u -r1.20 EditorActionBarsTest.java
>--- Eclipse UI Tests/org/eclipse/ui/tests/internal/EditorActionBarsTest.java	25 May 2009 20:52:55 -0000	1.20
>+++ Eclipse UI Tests/org/eclipse/ui/tests/internal/EditorActionBarsTest.java	2 Feb 2010 13:19:50 -0000
>@@ -18,10 +18,12 @@
> import org.eclipse.jface.action.ICoolBarManager;
> import org.eclipse.jface.action.IToolBarManager;
> import org.eclipse.jface.action.Separator;
>+import org.eclipse.jface.action.SubCoolBarManager;
> import org.eclipse.jface.action.ToolBarContributionItem;
> import org.eclipse.jface.action.ToolBarManager;
> import org.eclipse.swt.widgets.ToolBar;
> import org.eclipse.swt.widgets.ToolItem;
>+import org.eclipse.ui.IActionBars2;
> import org.eclipse.ui.IWorkbenchPage;
> import org.eclipse.ui.IWorkbenchWindow;
> import org.eclipse.ui.internal.WorkbenchWindow;
>@@ -113,6 +115,22 @@
>         fPage.activate(editor);
>         verifyToolItemState(contributor, true);
>     }
>+    
>+    public void testCoolBarContribution() throws Throwable {
>+    	
>+        MockEditorPart editor = openEditor(fPage, "3");
>+        MockEditorActionBarContributor contributor = (MockEditorActionBarContributor) editor
>+                .getEditorSite().getActionBarContributor();
>+        
>+        assertTrue(contributor.getActionBars() instanceof IActionBars2);
>+        IActionBars2 actionBars = (IActionBars2) contributor.getActionBars();
>+        
>+        assertTrue(actionBars.getCoolBarManager() instanceof SubCoolBarManager);
>+        SubCoolBarManager coolBarManager = (SubCoolBarManager) actionBars.getCoolBarManager();
>+        assertTrue("Coolbar should be visible", coolBarManager.isVisible());
>+    }
>+
>+
> 
>     /**
>      * Open a test editor.
>#P org.eclipse.ui.workbench
>Index: Eclipse UI/org/eclipse/ui/internal/EditorActionBars.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorActionBars.java,v
>retrieving revision 1.33
>diff -u -r1.33 EditorActionBars.java
>--- Eclipse UI/org/eclipse/ui/internal/EditorActionBars.java	25 May 2009 20:52:11 -0000	1.33
>+++ Eclipse UI/org/eclipse/ui/internal/EditorActionBars.java	2 Feb 2010 13:19:55 -0000
>@@ -21,6 +21,7 @@
> import org.eclipse.jface.action.IMenuManager;
> import org.eclipse.jface.action.IToolBarManager;
> import org.eclipse.jface.action.SubContributionManager;
>+import org.eclipse.jface.action.SubCoolBarManager;
> import org.eclipse.jface.action.SubMenuManager;
> import org.eclipse.jface.action.SubStatusLineManager;
> import org.eclipse.jface.action.SubToolBarManager;
>@@ -478,6 +479,9 @@
> 			if (toolBarContributionItem != null) {
> 				toolBarContributionItem.setVisible(visible || !forceVisibility);
> 			}
>+			if (getCoolBarManager() != null) {
>+				((SubCoolBarManager) getCoolBarManager()).setVisible(visible || !forceVisibility);
>+			}
> 		}
> 	}
>

Actions: View | Diff

Attachments on bug 161693: 52376 | 157898