Attachment #95838 for bug #226732

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




    private IWorkbenchAction introAction;

    // IDE-specific retarget actions
    private CommandContributionItem addBookmarkItem;

    private CommandContributionItem addTaskItem;

    IWorkbenchAction buildProjectAction;

    private CommandContributionItem openProjectItem;

    private CommandContributionItem closeProjectItem;

    // contribution items
    // @issue should obtain from ContributionItemFactory

        menu.add(new GroupMarker(IWorkbenchActionConstants.FIND_EXT));
        menu.add(new Separator());

        menu.add(addBookmarkItem);
        menu.add(addTaskItem);
        menu.add(new GroupMarker(IWorkbenchActionConstants.ADD_EXT));

        menu.add(new GroupMarker(IWorkbenchActionConstants.EDIT_END));

                IDEWorkbenchMessages.Workbench_project, IWorkbenchActionConstants.M_PROJECT);
        menu.add(new Separator(IWorkbenchActionConstants.PROJ_START));

        menu.add(openProjectItem);
        menu.add(closeProjectItem);
        menu.add(new GroupMarker(IWorkbenchActionConstants.OPEN_EXT));
        menu.add(new Separator());
        menu.add(buildAllAction);

        tipsAndTricksAction = null;
        showInQuickMenu = null;
        newQuickMenu = null;
        addBookmarkItem = null;
        addTaskItem = null;
        buildProjectAction = null;
        openProjectItem = null;
        closeProjectItem = null;
        newWizardMenu = null;
        pinEditorContributionItem = null;
//        searchComboItem = null;

        openPreferencesAction = ActionFactory.PREFERENCES.create(window);
        register(openPreferencesAction);

        String bookmarkId = "org.eclipse.ui.edit.addBookmark"; //$NON-NLS-1$
		CommandContributionItemParameter bookmarParm = new CommandContributionItemParameter(
				window,
				IDEActionFactory.BOOKMARK.getId(),
				bookmarkId,
				null,
				null,
				null,
				null, IDEWorkbenchMessages.Workbench_addBookmark, null,
				IDEWorkbenchMessages.Workbench_addBookmarkToolTip,
				CommandContributionItem.STYLE_PUSH, null, false);
		addBookmarkItem = new CommandContributionItem(bookmarParm);
        acms.map(IDEActionFactory.BOOKMARK.getId(), bookmarkId);
        

        String addTaskId = "org.eclipse.ui.edit.addTask"; //$NON-NLS-1$
		CommandContributionItemParameter addTaskParm = new CommandContributionItemParameter(
				window,
				IDEActionFactory.ADD_TASK.getId(),
				addTaskId,
				null,
				null,
				null,
				null, IDEWorkbenchMessages.Workbench_addTask, null,
				IDEWorkbenchMessages.Workbench_addTaskToolTip,
				CommandContributionItem.STYLE_PUSH, null, false);
        addTaskItem = new CommandContributionItem(addTaskParm);
        acms.map(IDEActionFactory.ADD_TASK.getId(), addTaskId);

        String deleteId = "org.eclipse.ui.edit.delete"; //$NON-NLS-1$
		CommandContributionItemParameter deleteParm = new CommandContributionItemParameter(

        buildProjectAction = IDEActionFactory.BUILD_PROJECT.create(window);
        register(buildProjectAction);

        String openProjectId = "org.eclipse.ui.project.openProject"; //$NON-NLS-1$
		CommandContributionItemParameter openProjectParm = new CommandContributionItemParameter(
				window,
				IDEActionFactory.OPEN_PROJECT.getId(),
				openProjectId,
				null,
				null,
				null,
				null, IDEWorkbenchMessages.OpenResourceAction_text, null,
				IDEWorkbenchMessages.OpenResourceAction_toolTip,
				CommandContributionItem.STYLE_PUSH, null, false);
		openProjectItem = new CommandContributionItem(openProjectParm);
        acms.map(IDEActionFactory.OPEN_PROJECT.getId(), openProjectId);

        String closeProjectId = "org.eclipse.ui.project.closeProject"; //$NON-NLS-1$
		CommandContributionItemParameter closeProjectParm = new CommandContributionItemParameter(
				window,
				IDEActionFactory.CLOSE_PROJECT.getId(),
				closeProjectId,
				null,
				null,
				null,
				null, IDEWorkbenchMessages.CloseResourceAction_text, null,
				IDEWorkbenchMessages.CloseResourceAction_text,
				CommandContributionItem.STYLE_PUSH, null, false);
		closeProjectItem = new CommandContributionItem(closeProjectParm);
        acms.map(IDEActionFactory.CLOSE_PROJECT.getId(), closeProjectId);

        openWorkspaceAction = IDEActionFactory.OPEN_WORKSPACE
                .create(window);

Return to bug 226732

Lines 221-235 Link Here

(-)src/org/eclipse/ui/internal/ide/WorkbenchActionBuilder.java (-20 / +65 lines)
221	private IWorkbenchAction introAction;	221	private IWorkbenchAction introAction;
222		222
223	// IDE-specific retarget actions	223	// IDE-specific retarget actions
224	private IWorkbenchAction addBookmarkAction;	224	private CommandContributionItem addBookmarkItem;
225		225
226	private IWorkbenchAction addTaskAction;	226	private CommandContributionItem addTaskItem;
227		227
228	IWorkbenchAction buildProjectAction;	228	IWorkbenchAction buildProjectAction;
229		229
230	private IWorkbenchAction openProjectAction;	230	private CommandContributionItem openProjectItem;
231		231
232	private IWorkbenchAction closeProjectAction;	232	private CommandContributionItem closeProjectItem;
233		233
234	// contribution items	234	// contribution items
235	// @issue should obtain from ContributionItemFactory	235	// @issue should obtain from ContributionItemFactory
Lines 555-562 Link Here
555	menu.add(new GroupMarker(IWorkbenchActionConstants.FIND_EXT));	555	menu.add(new GroupMarker(IWorkbenchActionConstants.FIND_EXT));
556	menu.add(new Separator());	556	menu.add(new Separator());
557		557
558	menu.add(addBookmarkAction);	558	menu.add(addBookmarkItem);
559	menu.add(addTaskAction);	559	menu.add(addTaskItem);
560	menu.add(new GroupMarker(IWorkbenchActionConstants.ADD_EXT));	560	menu.add(new GroupMarker(IWorkbenchActionConstants.ADD_EXT));
561		561
562	menu.add(new GroupMarker(IWorkbenchActionConstants.EDIT_END));	562	menu.add(new GroupMarker(IWorkbenchActionConstants.EDIT_END));
Lines 618-625 Link Here
618	IDEWorkbenchMessages.Workbench_project, IWorkbenchActionConstants.M_PROJECT);	618	IDEWorkbenchMessages.Workbench_project, IWorkbenchActionConstants.M_PROJECT);
619	menu.add(new Separator(IWorkbenchActionConstants.PROJ_START));	619	menu.add(new Separator(IWorkbenchActionConstants.PROJ_START));
620		620
621	menu.add(openProjectAction);	621	menu.add(openProjectItem);
622	menu.add(closeProjectAction);	622	menu.add(closeProjectItem);
623	menu.add(new GroupMarker(IWorkbenchActionConstants.OPEN_EXT));	623	menu.add(new GroupMarker(IWorkbenchActionConstants.OPEN_EXT));
624	menu.add(new Separator());	624	menu.add(new Separator());
625	menu.add(buildAllAction);	625	menu.add(buildAllAction);
Lines 902-912 Link Here
902	tipsAndTricksAction = null;	902	tipsAndTricksAction = null;
903	showInQuickMenu = null;	903	showInQuickMenu = null;
904	newQuickMenu = null;	904	newQuickMenu = null;
905	addBookmarkAction = null;	905	addBookmarkItem = null;
906	addTaskAction = null;	906	addTaskItem = null;
907	buildProjectAction = null;	907	buildProjectAction = null;
908	openProjectAction = null;	908	openProjectItem = null;
909	closeProjectAction = null;	909	closeProjectItem = null;
910	newWizardMenu = null;	910	newWizardMenu = null;
911	pinEditorContributionItem = null;	911	pinEditorContributionItem = null;
912	// searchComboItem = null;	912	// searchComboItem = null;
Lines 1133-1143 Link Here
1133	openPreferencesAction = ActionFactory.PREFERENCES.create(window);	1133	openPreferencesAction = ActionFactory.PREFERENCES.create(window);
1134	register(openPreferencesAction);	1134	register(openPreferencesAction);
1135		1135
1136	addBookmarkAction = IDEActionFactory.BOOKMARK.create(window);	1136	String bookmarkId = "org.eclipse.ui.edit.addBookmark"; //$NON-NLS-1$
1137	register(addBookmarkAction);	1137	CommandContributionItemParameter bookmarParm = new CommandContributionItemParameter(
		1138	window,
		1139	IDEActionFactory.BOOKMARK.getId(),
		1140	bookmarkId,
		1141	null,
		1142	null,
		1143	null,
		1144	null, IDEWorkbenchMessages.Workbench_addBookmark, null,
		1145	IDEWorkbenchMessages.Workbench_addBookmarkToolTip,
		1146	CommandContributionItem.STYLE_PUSH, null, false);
		1147	addBookmarkItem = new CommandContributionItem(bookmarParm);
		1148	acms.map(IDEActionFactory.BOOKMARK.getId(), bookmarkId);
		1149
1138		1150
1139	addTaskAction = IDEActionFactory.ADD_TASK.create(window);	1151	String addTaskId = "org.eclipse.ui.edit.addTask"; //$NON-NLS-1$
1140	register(addTaskAction);	1152	CommandContributionItemParameter addTaskParm = new CommandContributionItemParameter(
		1153	window,
		1154	IDEActionFactory.ADD_TASK.getId(),
		1155	addTaskId,
		1156	null,
		1157	null,
		1158	null,
		1159	null, IDEWorkbenchMessages.Workbench_addTask, null,
		1160	IDEWorkbenchMessages.Workbench_addTaskToolTip,
		1161	CommandContributionItem.STYLE_PUSH, null, false);
		1162	addTaskItem = new CommandContributionItem(addTaskParm);
		1163	acms.map(IDEActionFactory.ADD_TASK.getId(), addTaskId);
1141		1164
1142	String deleteId = "org.eclipse.ui.edit.delete"; //$NON-NLS-1$	1165	String deleteId = "org.eclipse.ui.edit.delete"; //$NON-NLS-1$
1143	CommandContributionItemParameter deleteParm = new CommandContributionItemParameter(	1166	CommandContributionItemParameter deleteParm = new CommandContributionItemParameter(
Lines 1334-1344 Link Here
1334	buildProjectAction = IDEActionFactory.BUILD_PROJECT.create(window);	1357	buildProjectAction = IDEActionFactory.BUILD_PROJECT.create(window);
1335	register(buildProjectAction);	1358	register(buildProjectAction);
1336		1359
1337	openProjectAction = IDEActionFactory.OPEN_PROJECT.create(window);	1360	String openProjectId = "org.eclipse.ui.project.openProject"; //$NON-NLS-1$
1338	register(openProjectAction);	1361	CommandContributionItemParameter openProjectParm = new CommandContributionItemParameter(
		1362	window,
		1363	IDEActionFactory.OPEN_PROJECT.getId(),
		1364	openProjectId,
		1365	null,
		1366	null,
		1367	null,
		1368	null, IDEWorkbenchMessages.OpenResourceAction_text, null,
		1369	IDEWorkbenchMessages.OpenResourceAction_toolTip,
		1370	CommandContributionItem.STYLE_PUSH, null, false);
		1371	openProjectItem = new CommandContributionItem(openProjectParm);
		1372	acms.map(IDEActionFactory.OPEN_PROJECT.getId(), openProjectId);
1339		1373
1340	closeProjectAction = IDEActionFactory.CLOSE_PROJECT.create(window);	1374	String closeProjectId = "org.eclipse.ui.project.closeProject"; //$NON-NLS-1$
1341	register(closeProjectAction);	1375	CommandContributionItemParameter closeProjectParm = new CommandContributionItemParameter(
		1376	window,
		1377	IDEActionFactory.CLOSE_PROJECT.getId(),
		1378	closeProjectId,
		1379	null,
		1380	null,
		1381	null,
		1382	null, IDEWorkbenchMessages.CloseResourceAction_text, null,
		1383	IDEWorkbenchMessages.CloseResourceAction_text,
		1384	CommandContributionItem.STYLE_PUSH, null, false);
		1385	closeProjectItem = new CommandContributionItem(closeProjectParm);
		1386	acms.map(IDEActionFactory.CLOSE_PROJECT.getId(), closeProjectId);
1342		1387
1343	openWorkspaceAction = IDEActionFactory.OPEN_WORKSPACE	1388	openWorkspaceAction = IDEActionFactory.OPEN_WORKSPACE
1344	.create(window);	1389	.create(window);