Attachment #157898 for bug #161693

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

View | Details | Raw Unified | Return to bug 161693
Collapse All | Expand All




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;

        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.

Lines 21-26 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/EditorActionBars.java (+4 lines)
21	import org.eclipse.jface.action.IMenuManager;	21	import org.eclipse.jface.action.IMenuManager;
22	import org.eclipse.jface.action.IToolBarManager;	22	import org.eclipse.jface.action.IToolBarManager;
23	import org.eclipse.jface.action.SubContributionManager;	23	import org.eclipse.jface.action.SubContributionManager;
		24	import org.eclipse.jface.action.SubCoolBarManager;
24	import org.eclipse.jface.action.SubMenuManager;	25	import org.eclipse.jface.action.SubMenuManager;
25	import org.eclipse.jface.action.SubStatusLineManager;	26	import org.eclipse.jface.action.SubStatusLineManager;
26	import org.eclipse.jface.action.SubToolBarManager;	27	import org.eclipse.jface.action.SubToolBarManager;
Lines 478-483 Link Here
478	if (toolBarContributionItem != null) {	479	if (toolBarContributionItem != null) {
479	toolBarContributionItem.setVisible(visible \|\| !forceVisibility);	480	toolBarContributionItem.setVisible(visible \|\| !forceVisibility);
480	}	481	}
		482	if (getCoolBarManager() != null) {
		483	((SubCoolBarManager) getCoolBarManager()).setVisible(visible \|\| !forceVisibility);
		484	}
481	}	485	}
482	}	486	}
483		487

Return to bug 161693

Lines 18-27 Link Here

(-)Eclipse UI Tests/org/eclipse/ui/tests/internal/EditorActionBarsTest.java (+18 lines)
18	import org.eclipse.jface.action.ICoolBarManager;	18	import org.eclipse.jface.action.ICoolBarManager;
19	import org.eclipse.jface.action.IToolBarManager;	19	import org.eclipse.jface.action.IToolBarManager;
20	import org.eclipse.jface.action.Separator;	20	import org.eclipse.jface.action.Separator;
		21	import org.eclipse.jface.action.SubCoolBarManager;
21	import org.eclipse.jface.action.ToolBarContributionItem;	22	import org.eclipse.jface.action.ToolBarContributionItem;
22	import org.eclipse.jface.action.ToolBarManager;	23	import org.eclipse.jface.action.ToolBarManager;
23	import org.eclipse.swt.widgets.ToolBar;	24	import org.eclipse.swt.widgets.ToolBar;
24	import org.eclipse.swt.widgets.ToolItem;	25	import org.eclipse.swt.widgets.ToolItem;
		26	import org.eclipse.ui.IActionBars2;
25	import org.eclipse.ui.IWorkbenchPage;	27	import org.eclipse.ui.IWorkbenchPage;
26	import org.eclipse.ui.IWorkbenchWindow;	28	import org.eclipse.ui.IWorkbenchWindow;
27	import org.eclipse.ui.internal.WorkbenchWindow;	29	import org.eclipse.ui.internal.WorkbenchWindow;
Lines 113-118 Link Here
113	fPage.activate(editor);	115	fPage.activate(editor);
114	verifyToolItemState(contributor, true);	116	verifyToolItemState(contributor, true);
115	}	117	}
		118
		119	public void testCoolBarContribution() throws Throwable {
		120
		121	MockEditorPart editor = openEditor(fPage, "3");
		122	MockEditorActionBarContributor contributor = (MockEditorActionBarContributor) editor
		123	.getEditorSite().getActionBarContributor();
		124
		125	assertTrue(contributor.getActionBars() instanceof IActionBars2);
		126	IActionBars2 actionBars = (IActionBars2) contributor.getActionBars();
		127
		128	assertTrue(actionBars.getCoolBarManager() instanceof SubCoolBarManager);
		129	SubCoolBarManager coolBarManager = (SubCoolBarManager) actionBars.getCoolBarManager();
		130	assertTrue("Coolbar should be visible", coolBarManager.isVisible());
		131	}
		132
		133
116		134
117	/**	135	/**
118	* Open a test editor.	136	* Open a test editor.