Attachment 34111 Details for Bug 123257 – Optional patch to IDE plug-in to make it compatible with these changes

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

[patch] Optional patch to IDE plug-in to make it compatible with these changes

ActionBarPresentation_ui.ide_HEAD_patch.txt (text/plain), 5.12 KB, created by Matthew Hatem

on 2006-02-03 14:31:51 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Hatem

Created: 2006-02-03 14:31:51 EST

Size: 5.12 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.ide
>Index: src/org/eclipse/ui/internal/ide/WorkbenchActionBuilder.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/WorkbenchActionBuilder.java,v
>retrieving revision 1.81
>diff -u -r1.81 WorkbenchActionBuilder.java
>--- src/org/eclipse/ui/internal/ide/WorkbenchActionBuilder.java	30 Jan 2006 21:11:15 -0000	1.81
>+++ src/org/eclipse/ui/internal/ide/WorkbenchActionBuilder.java	3 Feb 2006 19:23:48 -0000
>@@ -30,7 +30,6 @@
> import org.eclipse.jface.action.MenuManager;
> import org.eclipse.jface.action.Separator;
> import org.eclipse.jface.action.ToolBarContributionItem;
>-import org.eclipse.jface.action.ToolBarManager;
> import org.eclipse.jface.preference.IPreferenceStore;
> import org.eclipse.jface.util.IPropertyChangeListener;
> import org.eclipse.jface.util.PropertyChangeEvent;
>@@ -217,8 +216,6 @@
>     private IWorkbenchAction openProjectAction;
> 
>     private IWorkbenchAction closeProjectAction;
>-    
>-    private IWorkbenchAction closeUnrelatedProjectsAction;
> 
>     // contribution items
>     // @issue should obtain from ContributionItemFactory
>@@ -358,6 +355,7 @@
>      */
>     protected void fillCoolBar(ICoolBarManager coolBar) {
> 
>+    	IActionBarConfigurer actionBarConfigurer = getActionBarConfigurer();
>         { // Set up the context Menu
>             IMenuManager popUpMenu = new MenuManager();
>             popUpMenu.add(new ActionContributionItem(lockToolBarAction));
>@@ -366,8 +364,7 @@
>         }
>         coolBar.add(new GroupMarker(IIDEActionConstants.GROUP_FILE));
>         { // File Group
>-            IToolBarManager fileToolBar = new ToolBarManager(coolBar
>-                    .getStyle());
>+            IToolBarManager fileToolBar = actionBarConfigurer.createToolBarManager(coolBar.getStyle());
>             fileToolBar.add(new Separator(IWorkbenchActionConstants.NEW_GROUP));
>             fileToolBar.add(newWizardDropDownAction);
>             fileToolBar.add(new GroupMarker(IWorkbenchActionConstants.NEW_EXT));
>@@ -388,7 +385,7 @@
>                     IWorkbenchActionConstants.MB_ADDITIONS));
> 
>             // Add to the cool bar manager
>-            coolBar.add(new ToolBarContributionItem(fileToolBar,
>+            coolBar.add(actionBarConfigurer.createToolBarContributionItem(fileToolBar,
>                     IWorkbenchActionConstants.TOOLBAR_FILE));
>         }
> 
>@@ -396,7 +393,7 @@
> 
>         coolBar.add(new GroupMarker(IIDEActionConstants.GROUP_NAV));
>         { // Navigate group
>-            IToolBarManager navToolBar = new ToolBarManager(coolBar
>+            IToolBarManager navToolBar = actionBarConfigurer.createToolBarManager(coolBar
>                     .getStyle());
>             navToolBar.add(new Separator(
>                     IWorkbenchActionConstants.HISTORY_GROUP));
>@@ -408,7 +405,7 @@
>             navToolBar.add(pinEditorContributionItem);
> 
>             // Add to the cool bar manager
>-            coolBar.add(new ToolBarContributionItem(navToolBar,
>+            coolBar.add(actionBarConfigurer.createToolBarContributionItem(navToolBar,
>                     IWorkbenchActionConstants.TOOLBAR_NAVIGATE));
>         }
> 
>@@ -417,14 +414,14 @@
>         coolBar.add(new GroupMarker(IWorkbenchActionConstants.GROUP_HELP));
>         
>         { // Help group
>-            IToolBarManager helpToolBar = new ToolBarManager(coolBar
>+            IToolBarManager helpToolBar = actionBarConfigurer.createToolBarManager(coolBar
>                     .getStyle());
>             helpToolBar.add(new Separator(IWorkbenchActionConstants.GROUP_HELP));
> //            helpToolBar.add(searchComboItem);
>               // Add the group for applications to contribute
>             helpToolBar.add(new GroupMarker(IWorkbenchActionConstants.GROUP_APP));              
>             // Add to the cool bar manager
>-            coolBar.add(new ToolBarContributionItem(helpToolBar,
>+            coolBar.add(actionBarConfigurer.createToolBarContributionItem(helpToolBar,
>                     IWorkbenchActionConstants.TOOLBAR_HELP));
>         }        
> 
>@@ -611,7 +608,6 @@
> 
>         menu.add(openProjectAction);
>         menu.add(closeProjectAction);
>-        menu.add(closeUnrelatedProjectsAction);
>         menu.add(new GroupMarker(IWorkbenchActionConstants.OPEN_EXT));
>         menu.add(new Separator());
>         menu.add(buildAllAction);
>@@ -1120,7 +1116,6 @@
>         buildProjectAction = null;
>         openProjectAction = null;
>         closeProjectAction = null;
>-        closeUnrelatedProjectsAction = null;
>         newWizardMenu = null;
>         pinEditorContributionItem = null;
> //        searchComboItem = null;
>@@ -1402,9 +1397,6 @@
>         closeProjectAction = IDEActionFactory.CLOSE_PROJECT.create(window);
>         register(closeProjectAction);
> 
>-        closeUnrelatedProjectsAction = IDEActionFactory.CLOSE_UNRELATED_PROJECTS.create(window);
>-        register(closeUnrelatedProjectsAction);
>-
>         openWorkspaceAction = IDEActionFactory.OPEN_WORKSPACE
>                 .create(window);
>         register(openWorkspaceAction);

Actions: View | Diff

Attachments on bug 123257: 33169 | 33171 | 33172 | 33173 | 34107 | 34108 | 34109 | 34110 | 34111 | 34239 | 34308 | 34367 | 34373 | 34437