Attachment #173859 for bug #318715

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 318715
Collapse All | Expand All

Lines 1-8 Link Here

(-)LegacyIDE.e4xmi (-2 lines)
1	<?xml version="1.0" encoding="ASCII"?>	1	<?xml version="1.0" encoding="ASCII"?>
2	<application:Application xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:application="http://www.eclipse.org/ui/2010/UIModel/application" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmlns:menu="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu" xsi:schemaLocation="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic http://www.eclipse.org/ui/2010/UIModel/application#//ui/basic http://www.eclipse.org/ui/2010/UIModel/application/ui/menu http://www.eclipse.org/ui/2010/UIModel/application#//ui/menu" xmi:id="org.eclipse.e4.legacy.ide.application" elementId="org.eclipse.e4.legacy.ide.application">	2	<application:Application xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:application="http://www.eclipse.org/ui/2010/UIModel/application" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmlns:menu="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu" xsi:schemaLocation="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic http://www.eclipse.org/ui/2010/UIModel/application#//ui/basic http://www.eclipse.org/ui/2010/UIModel/application/ui/menu http://www.eclipse.org/ui/2010/UIModel/application#//ui/menu" xmi:id="org.eclipse.e4.legacy.ide.application" elementId="org.eclipse.e4.legacy.ide.application">
3	<children xsi:type="basic:TrimmedWindow" xmi:id="IDEWindow" elementId="IDEWindow" label="Eclipse SDK 4.0" width="1024" height="768">	3	<children xsi:type="basic:TrimmedWindow" xmi:id="IDEWindow" elementId="IDEWindow" label="Eclipse SDK 4.0" width="1024" height="768">
4	<trimBars xmi:id="org.eclipse.ui.main.toolbar" elementId="org.eclipse.ui.main.toolbar">
5	</trimBars>
6	</children>	4	</children>
7	<handlers xmi:id="_UW9TY_r3Ed6gmo7caOxU9g" elementId="_UW9TY_r3Ed6gmo7caOxU9g" contributionURI="platform:/plugin/org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.ExitHandler" command="e4.exit"/>	5	<handlers xmi:id="_UW9TY_r3Ed6gmo7caOxU9g" elementId="_UW9TY_r3Ed6gmo7caOxU9g" contributionURI="platform:/plugin/org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.ExitHandler" command="e4.exit"/>
8	<handlers xmi:id="_BESTZfr3Ed6gmo7caOxU04" elementId="_BESTZfr3Ed6gmo7caOxU04" contributionURI="platform:/plugin/org.eclipse.e4.ui.workbench.swt/org.eclipse.e4.ui.internal.workbench.swt.handlers.ShowViewHandler" command="e4.show.view"/>	6	<handlers xmi:id="_BESTZfr3Ed6gmo7caOxU04" elementId="_BESTZfr3Ed6gmo7caOxU04" contributionURI="platform:/plugin/org.eclipse.e4.ui.workbench.swt/org.eclipse.e4.ui.internal.workbench.swt.handlers.ShowViewHandler" command="e4.show.view"/>

Lines 1790-1799 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/WorkbenchPage.java (-4 lines)
1790	contextService.activateContext(id);	1790	contextService.activateContext(id);
1791	}	1791	}
1792		1792
1793	List<String> ids = ModeledPageLayout.getIds(newPersp,
1794	ModeledPageLayout.ACTION_SET_TAG);
1795	legacyWindow.populateTrimContributions(ids, true);
1796
1797	legacyWindow.firePerspectiveActivated(WorkbenchPage.this, perspective);	1793	legacyWindow.firePerspectiveActivated(WorkbenchPage.this, perspective);
1798	}	1794	}
1799	};	1795	};




import org.eclipse.ui.internal.actions.CommandAction;
import org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor;
import org.eclipse.ui.internal.e4.compatibility.E4Util;
import org.eclipse.ui.internal.e4.compatibility.ModeledPageLayout;
import org.eclipse.ui.internal.e4.compatibility.SelectionService;
import org.eclipse.ui.internal.handlers.ActionCommandMappingService;
import org.eclipse.ui.internal.handlers.IActionCommandMappingService;

		page.setPerspective(perspective);
		firePageActivated();

		populateTrimContributions();
			populateTrimContributions(ModeledPageLayout.getIds(curPersp, ACTION_SET_CMD_PREFIX),
					true);
		}

		Shell shell = (Shell) model.getWidget();
		MMenu mainMenu = model.getMainMenu();

		trimBars.remove(trimBar);
	}

	void populateTrimContributions() {
		if (getTopTrim() != null) {
			throw new IllegalStateException("The top trim is already set"); //$NON-NLS-1$
		}
		MTrimBar trimBar = BasicFactoryImpl.eINSTANCE.createTrimBar();
		trimBar.setElementId(MAIN_TOOLBAR_ID);

		MTrimBar trimBar = getTopTrim();
		fill(trimBar, getCoolBarManager2());

		if (false) {
			// TODO don't do this yet, it should be handled by the TrimRenderer
			for (String actionSet : actionSets) {
				MToolBar toolBar = MenuFactoryImpl.eINSTANCE.createToolBar();
				toolBar.setElementId(actionSet);
				MToolBarSeparator separator = MenuFactoryImpl.eINSTANCE.createToolBarSeparator();
				separator.setElementId(actionSet);
				separator.setToBeRendered(false);
				toolBar.getChildren().add(separator);
				trimBar.getChildren().add(toolBar);
				workbenchTrimElements.add(toolBar);
			}
		}

		// TODO why aren't these added as trim contributions
		// that would remove everything from this method except the fill(*)
		MToolControl spacerControl = MenuFactoryImpl.eINSTANCE.createToolControl();

		workbenchTrimElements.add(searchControl);
		workbenchTrimElements.add(glueControl);
		workbenchTrimElements.add(switcherControl);

		// and now add it to the model, start the rendering
		List<MTrimBar> trimBars = model.getTrimBars();
		trimBars.add(0, trimBar);
	}

	private MTrimBar getTopTrim() {

				return bar;
			}
		}
		return null;
		trimBar.setElementId(MAIN_TOOLBAR_ID);
		trimBars.add(0, trimBar);
		return trimBar;
	}

	private void fill(MMenu menu, IMenuManager manager) {

				container.getChildren().add(toolBar);
				workbenchTrimElements.add(toolBar);
			} else if (item instanceof AbstractGroupMarker) {
				System.out.println("group: " + item.getId()); //$NON-NLS-1$
				MToolBarSeparator separator = MenuFactoryImpl.eINSTANCE.createToolBarSeparator();
				separator.setToBeRendered(item.isVisible());
				separator.setElementId(item.getId());

Return to bug 318715

Lines 131-137 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java (-26 / +13 lines)
131	import org.eclipse.ui.internal.actions.CommandAction;	131	import org.eclipse.ui.internal.actions.CommandAction;
132	import org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor;	132	import org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor;
133	import org.eclipse.ui.internal.e4.compatibility.E4Util;	133	import org.eclipse.ui.internal.e4.compatibility.E4Util;
134	import org.eclipse.ui.internal.e4.compatibility.ModeledPageLayout;
135	import org.eclipse.ui.internal.e4.compatibility.SelectionService;	134	import org.eclipse.ui.internal.e4.compatibility.SelectionService;
136	import org.eclipse.ui.internal.handlers.ActionCommandMappingService;	135	import org.eclipse.ui.internal.handlers.ActionCommandMappingService;
137	import org.eclipse.ui.internal.handlers.IActionCommandMappingService;	136	import org.eclipse.ui.internal.handlers.IActionCommandMappingService;
Lines 487-496 Link Here
487	page.setPerspective(perspective);	486	page.setPerspective(perspective);
488	firePageActivated();	487	firePageActivated();
489		488
490	if (curPersp != null) {	489	populateTrimContributions();
491	populateTrimContributions(ModeledPageLayout.getIds(curPersp, ACTION_SET_CMD_PREFIX),
492	true);
493	}
494		490
495	Shell shell = (Shell) model.getWidget();	491	Shell shell = (Shell) model.getWidget();
496	MMenu mainMenu = model.getMainMenu();	492	MMenu mainMenu = model.getMainMenu();
Lines 537-562 Link Here
537	trimBars.remove(trimBar);	533	trimBars.remove(trimBar);
538	}	534	}
539		535
540	void populateTrimContributions(List<String> actionSets, boolean reload) {	536	void populateTrimContributions() {
541	removeTrimContributions();	537	if (getTopTrim() != null) {
		538	throw new IllegalStateException("The top trim is already set"); //$NON-NLS-1$
		539	}
		540	MTrimBar trimBar = BasicFactoryImpl.eINSTANCE.createTrimBar();
		541	trimBar.setElementId(MAIN_TOOLBAR_ID);
542		542
543	MTrimBar trimBar = getTopTrim();
544	fill(trimBar, getCoolBarManager2());	543	fill(trimBar, getCoolBarManager2());
545		544
546	if (false) {
547	// TODO don't do this yet, it should be handled by the TrimRenderer
548	for (String actionSet : actionSets) {
549	MToolBar toolBar = MenuFactoryImpl.eINSTANCE.createToolBar();
550	toolBar.setElementId(actionSet);
551	MToolBarSeparator separator = MenuFactoryImpl.eINSTANCE.createToolBarSeparator();
552	separator.setElementId(actionSet);
553	separator.setToBeRendered(false);
554	toolBar.getChildren().add(separator);
555	trimBar.getChildren().add(toolBar);
556	workbenchTrimElements.add(toolBar);
557	}
558	}
559
560	// TODO why aren't these added as trim contributions	545	// TODO why aren't these added as trim contributions
561	// that would remove everything from this method except the fill(*)	546	// that would remove everything from this method except the fill(*)
562	MToolControl spacerControl = MenuFactoryImpl.eINSTANCE.createToolControl();	547	MToolControl spacerControl = MenuFactoryImpl.eINSTANCE.createToolControl();
Lines 591-596 Link Here
591	workbenchTrimElements.add(searchControl);	576	workbenchTrimElements.add(searchControl);
592	workbenchTrimElements.add(glueControl);	577	workbenchTrimElements.add(glueControl);
593	workbenchTrimElements.add(switcherControl);	578	workbenchTrimElements.add(switcherControl);
		579
		580	// and now add it to the model, start the rendering
		581	List<MTrimBar> trimBars = model.getTrimBars();
		582	trimBars.add(0, trimBar);
594	}	583	}
595		584
596	private MTrimBar getTopTrim() {	585	private MTrimBar getTopTrim() {
Lines 600-609 Link Here
600	return bar;	589	return bar;
601	}	590	}
602	}	591	}
603	MTrimBar trimBar = BasicFactoryImpl.eINSTANCE.createTrimBar();	592	return null;
604	trimBar.setElementId(MAIN_TOOLBAR_ID);
605	trimBars.add(0, trimBar);
606	return trimBar;
607	}	593	}
608		594
609	private void fill(MMenu menu, IMenuManager manager) {	595	private void fill(MMenu menu, IMenuManager manager) {
Lines 731-736 Link Here
731	container.getChildren().add(toolBar);	717	container.getChildren().add(toolBar);
732	workbenchTrimElements.add(toolBar);	718	workbenchTrimElements.add(toolBar);
733	} else if (item instanceof AbstractGroupMarker) {	719	} else if (item instanceof AbstractGroupMarker) {
		720	System.out.println("group: " + item.getId()); //$NON-NLS-1$
734	MToolBarSeparator separator = MenuFactoryImpl.eINSTANCE.createToolBarSeparator();	721	MToolBarSeparator separator = MenuFactoryImpl.eINSTANCE.createToolBarSeparator();
735	separator.setToBeRendered(item.isVisible());	722	separator.setToBeRendered(item.isVisible());
736	separator.setElementId(item.getId());	723	separator.setElementId(item.getId());