Target Explorer: editor toolbar menu contributions

10 files changed, 133 insertions, 127 deletions

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/editor/AbstractLaunchTabContainerEditorPage.java b/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/editor/AbstractLaunchTabContainerEditorPage.java
index af1f3c0bd..15e540c68 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/editor/AbstractLaunchTabContainerEditorPage.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/editor/AbstractLaunchTabContainerEditorPage.java
@@ -69,14 +69,6 @@ public abstract class AbstractLaunchTabContainerEditorPage extends AbstractCusto
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.tcf.te.ui.views.editor.pages.AbstractCustomFormToolkitEditorPage#hasApplyAction()
-	 */
-	@Override
-	protected boolean hasApplyAction() {
-	    return true;
-	}
-
-	/* (non-Javadoc)
 	 * @see org.eclipse.tcf.te.ui.views.editor.pages.AbstractCustomFormToolkitEditorPage#getContextHelpId()
 	 */
 	@Override
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/plugin.xml b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/plugin.xml
index 1a2c49a1e..5d4d4f684 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/plugin.xml
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/plugin.xml
@@ -265,6 +265,45 @@
          </command>
       </menuContribution>
 
+      <menuContribution locationURI="toolbar:org.eclipse.tcf.te.tcf.launch.ui.MemoryMapEditorPage?after=group.connect">
+         <command commandId="org.eclipse.tcf.te.ui.editor.command.connect">
+            <visibleWhen checkEnabled="false">
+               <reference definitionId="te.expressions.editor.IConnectable"/>
+            </visibleWhen>
+         </command>
+         <command commandId="org.eclipse.tcf.te.ui.editor.command.disconnect">
+            <visibleWhen checkEnabled="false">
+               <reference definitionId="te.expressions.editor.IConnectable"/>
+            </visibleWhen>
+         </command>
+      </menuContribution>
+
+      <menuContribution locationURI="toolbar:org.eclipse.tcf.te.tcf.launch.ui.PathMapEditorPage?after=group.connect">
+         <command commandId="org.eclipse.tcf.te.ui.editor.command.connect">
+            <visibleWhen checkEnabled="false">
+               <reference definitionId="te.expressions.editor.IConnectable"/>
+            </visibleWhen>
+         </command>
+         <command commandId="org.eclipse.tcf.te.ui.editor.command.disconnect">
+            <visibleWhen checkEnabled="false">
+               <reference definitionId="te.expressions.editor.IConnectable"/>
+            </visibleWhen>
+         </command>
+      </menuContribution>
+
+      <menuContribution locationURI="toolbar:org.eclipse.tcf.te.launch.ui.SourceLookupEditorPage?after=group.connect">
+         <command commandId="org.eclipse.tcf.te.ui.editor.command.connect">
+            <visibleWhen checkEnabled="false">
+               <reference definitionId="te.expressions.editor.IConnectable"/>
+            </visibleWhen>
+         </command>
+         <command commandId="org.eclipse.tcf.te.ui.editor.command.disconnect">
+            <visibleWhen checkEnabled="false">
+               <reference definitionId="te.expressions.editor.IConnectable"/>
+            </visibleWhen>
+         </command>
+      </menuContribution>
+
    </extension>
 
 <!-- Command contributions -->
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/editor/AbstractTcfLaunchTabContainerEditorPage.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/editor/AbstractTcfLaunchTabContainerEditorPage.java
index f8cc02c90..15c896dc7 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/editor/AbstractTcfLaunchTabContainerEditorPage.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/editor/AbstractTcfLaunchTabContainerEditorPage.java
@@ -45,14 +45,6 @@ public abstract class AbstractTcfLaunchTabContainerEditorPage extends AbstractLa
 		return (IPeerNode) ((IAdaptable) input).getAdapter(IPeerNode.class);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.tcf.te.launch.ui.editor.AbstractLaunchTabContainerEditorPage#hasApplyAction()
-	 */
-	@Override
-	protected boolean hasApplyAction() {
-		return !isAutoSave();
-	}
-
 	private boolean isAutoSave() {
 		boolean autoSave = !UIPlugin.getDefault().getPreferenceStore().getBoolean("NoLaunchEditorTabAutoSave"); //$NON-NLS-1$
 		return autoSave;
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/plugin.xml b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/plugin.xml
index ae462b3cc..0651bcd21 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/plugin.xml
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/plugin.xml
@@ -167,6 +167,8 @@
 
 <!-- Processes menu contributions -->
    <extension point="org.eclipse.ui.menus">
+
+   <!-- System Managegement View context menu contributions -->
       <menuContribution locationURI="popup:org.eclipse.tcf.te.ui.views.View#Popup?after=group.launch.rundebug">
          <command
                commandId="org.eclipse.tcf.te.launch.command.attach"
@@ -193,7 +195,6 @@
                </with>
             </visibleWhen>
          </command>
-
          <command
                commandId="org.eclipse.tcf.te.launch.command.detach"
                disabledIcon="platform:/plugin/org.eclipse.tcf.te.launch.ui/icons/dlcl16/detach.gif"
@@ -219,7 +220,6 @@
                </with>
             </visibleWhen>
          </command>
-         
          <command
                commandId="org.eclipse.tcf.te.launch.command.terminate"
                icon="platform:/plugin/org.eclipse.debug.ui/icons/full/elcl16/terminate_co.gif"
@@ -232,7 +232,6 @@
             </visibleWhen>
          </command>
       </menuContribution>
-     
       <menuContribution locationURI="popup:org.eclipse.tcf.te.ui.views.View#Popup?after=group.refresh">
          <command
                commandId="org.eclipse.tcf.te.ui.command.refresh"
@@ -255,7 +254,23 @@
          </command>
       </menuContribution>
 
-      <menuContribution locationURI="toolbar:org.eclipse.tcf.te.tcf.processes.ui.ProcessExplorerEditorPage?before=additions">
+   <!-- Editor page toolbar contributions -->
+      <menuContribution locationURI="toolbar:org.eclipse.tcf.te.tcf.processes.ui.ProcessExplorerEditorPage?after=group.connect">
+         <command commandId="org.eclipse.tcf.te.ui.editor.command.connect">
+            <visibleWhen checkEnabled="false">
+               <reference definitionId="te.expressions.editor.IConnectable"/>
+            </visibleWhen>
+         </command>
+         <command commandId="org.eclipse.tcf.te.ui.editor.command.disconnect">
+            <visibleWhen checkEnabled="false">
+               <reference definitionId="te.expressions.editor.IConnectable"/>
+            </visibleWhen>
+         </command>
+      </menuContribution>
+      <menuContribution locationURI="toolbar:org.eclipse.tcf.te.tcf.processes.ui.ProcessExplorerEditorPage?after=group.launch.rundebug">
+         <command commandId="org.eclipse.tcf.te.tcf.ui.editor.command.debug"/>
+      </menuContribution>
+      <menuContribution locationURI="toolbar:org.eclipse.tcf.te.tcf.processes.ui.ProcessExplorerEditorPage?after=group.additions">
          <command
                commandId="org.eclipse.tcf.te.tcf.processes.ui.command.refreshViewer"
                icon="icons/obj16/refresh.gif"
@@ -272,14 +287,19 @@
                tooltip="%command.configure.tooltip">
          </command>
       </menuContribution>
-
       <menuContribution locationURI="menu:org.eclipse.tcf.te.tcf.processes.ui.ProcessExplorerEditorPage.refreshInterval">
          <dynamic
                class="org.eclipse.tcf.te.tcf.processes.ui.handler.ConfigIntervalDynamicContribution"
                id="org.eclipse.tcf.te.tcf.processes.ui.menu.refreshIntervalDynamic">
          </dynamic>
       </menuContribution>
+
+   <!-- Editor page toolbar menu contributions -->
+      <menuContribution locationURI="menu:org.eclipse.tcf.te.tcf.processes.ui.ProcessExplorerEditorPage?after=group.additions">
+         <command commandId="org.eclipse.tcf.te.ui.command.showIn.systemManagement"/>
+      </menuContribution>
       
+   <!-- Editor page context menu contributions -->
       <menuContribution locationURI="popup:org.eclipse.tcf.te.tcf.processes.ui.ProcessExplorerEditorPage?after=additions">
          <separator
                name="group.showIn"
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/plugin.xml b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/plugin.xml
index 69c2c4bce..5826bab74 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/plugin.xml
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/plugin.xml
@@ -137,6 +137,7 @@
                   wizardId="org.eclipse.tcf.te.tcf.ui.wizards.NewTargetWizard">
                <enablement>
                   <or>
+                     <instanceof value="org.eclipse.tcf.protocol.IPeer"/>
                      <and>
                         <instanceof value="org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerNode"/>
                         <test property="org.eclipse.tcf.te.tcf.locator.isOfType" value="null"/>
@@ -399,7 +400,8 @@
                <with variable="selection">
                   <count value="1"/>
                   <iterate operator="and" ifEmpty="false">
-                     <adapt type="org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerNode">
+                     <and>
+                        <instanceof value="org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerNode"/>
                         <or>
                            <test property="org.eclipse.tcf.te.tcf.locator.hasRemoteService" value="RunControl"/>
                            <test property="org.eclipse.tcf.te.tcf.locator.hasOfflineService" value="RunControl"/>
@@ -414,12 +416,60 @@
                                  args="org.eclipse.tcf.te.tcf.ui.command.debug"
                                  value="true"/>
                         </or>
-                     </adapt>
+                     </and>
                   </iterate>
                </with>
             </visibleWhen>
          </command> 
       </menuContribution>
+      <menuContribution locationURI="popup:org.eclipse.tcf.te.ui.views.View#Popup?after=group.importexport">
+          <command commandId="org.eclipse.ui.file.import">
+             <visibleWhen checkEnabled="false">
+                <with variable="selection">
+                   <iterate operator="and" ifEmpty="false">
+                     <and>
+                        <instanceof value="org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerNode"/>
+                         <or>
+                            <not>
+                               <test
+                                     forcePluginActivation="true"
+                                     property="org.eclipse.tcf.te.runtime.services.hasService"
+                                     value="org.eclipse.tcf.te.runtime.services.interfaces.IMenuService"/>
+                            </not>
+                            <test
+                                  property="org.eclipse.tcf.te.runtime.services.menu.isVisible"
+                                  args="org.eclipse.ui.file.import"
+                                  value="true"/>
+                         </or>
+                      </and>
+                   </iterate>
+                </with>
+             </visibleWhen>
+          </command>
+          <command commandId="org.eclipse.ui.file.export">
+             <visibleWhen checkEnabled="false">
+                <with variable="selection">
+                   <iterate operator="and" ifEmpty="false">
+                     <and>
+                        <instanceof value="org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerNode"/>
+                         <or>
+                            <not>
+                               <test
+                                     forcePluginActivation="true"
+                                     property="org.eclipse.tcf.te.runtime.services.hasService"
+                                     value="org.eclipse.tcf.te.runtime.services.interfaces.IMenuService"/>
+                            </not>
+                            <test
+                                  property="org.eclipse.tcf.te.runtime.services.menu.isVisible"
+                                  args="org.eclipse.ui.file.export"
+                                  value="true"/>
+                         </or>
+                      </and>
+                   </iterate>
+                </with>
+             </visibleWhen>
+          </command>
+      </menuContribution>
 
    <!-- Editor page toolbar contributions -->
       <menuContribution locationURI="toolbar:org.eclipse.tcf.te.tcf.ui.OverviewEditorPage?after=group.connect">
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/AbstractConfigurationEditorPage.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/AbstractConfigurationEditorPage.java
index 629927df1..ffad82019 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/AbstractConfigurationEditorPage.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/editor/AbstractConfigurationEditorPage.java
@@ -52,14 +52,6 @@ public abstract class AbstractConfigurationEditorPage extends AbstractCustomForm
 		super.setInput(input);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.tcf.te.ui.views.editor.pages.AbstractCustomFormToolkitEditorPage#hasApplyAction()
-	 */
-	@Override
-	protected boolean hasApplyAction() {
-		return true;
-	}
-
 	/**
 	 * Add the target selector section if an {@link ISimulatorService} is available.
 	 * @param form The form.
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/plugin.xml b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/plugin.xml
index 1589ccfde..a85534a95 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/plugin.xml
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/plugin.xml
@@ -361,51 +361,6 @@
          </command>
       </menuContribution>
       
-      <menuContribution locationURI="popup:org.eclipse.tcf.te.ui.views.View#Popup?after=group.importexport">
-          <command
-                commandId="org.eclipse.ui.file.import">
-             <visibleWhen checkEnabled="false">
-                <with variable="selection">
-                   <iterate operator="and" ifEmpty="false">
-                      <or>
-                         <not>
-                            <test
-                                  forcePluginActivation="true"
-                                  property="org.eclipse.tcf.te.runtime.services.hasService"
-                                  value="org.eclipse.tcf.te.runtime.services.interfaces.IMenuService"/>
-                         </not>
-                         <test
-                               property="org.eclipse.tcf.te.runtime.services.menu.isVisible"
-                               args="org.eclipse.ui.file.import"
-                               value="true"/>
-                      </or>
-                   </iterate>
-                </with>
-             </visibleWhen>
-          </command>
-          <command
-                commandId="org.eclipse.ui.file.export">
-             <visibleWhen checkEnabled="false">
-                <with variable="selection">
-                   <iterate operator="and" ifEmpty="false">
-                      <or>
-                         <not>
-                            <test
-                                  forcePluginActivation="true"
-                                  property="org.eclipse.tcf.te.runtime.services.hasService"
-                                  value="org.eclipse.tcf.te.runtime.services.interfaces.IMenuService"/>
-                         </not>
-                         <test
-                               property="org.eclipse.tcf.te.runtime.services.menu.isVisible"
-                               args="org.eclipse.ui.file.export"
-                               value="true"/>
-                      </or>
-                   </iterate>
-                </with>
-             </visibleWhen>
-          </command>
-      </menuContribution>
-      
       <menuContribution locationURI="popup:org.eclipse.tcf.te.ui.views.View#Popup?after=group.showIn">
          <menu
                commandId="org.eclipse.tcf.te.ui.views.command.ShowInGroup"
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/editor/pages/AbstractCustomFormToolkitEditorPage.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/editor/pages/AbstractCustomFormToolkitEditorPage.java
index b045054aa..4f714d995 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/editor/pages/AbstractCustomFormToolkitEditorPage.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/editor/pages/AbstractCustomFormToolkitEditorPage.java
@@ -37,8 +37,6 @@ import org.eclipse.tcf.te.ui.views.nls.Messages;
 import org.eclipse.ui.IWorkbenchActionConstants;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.menus.CommandContributionItem;
-import org.eclipse.ui.menus.CommandContributionItemParameter;
 import org.eclipse.ui.menus.IMenuService;
 
 /**
@@ -238,26 +236,9 @@ public abstract class AbstractCustomFormToolkitEditorPage extends AbstractEditor
 		manager.add(new Separator("group.connect")); //$NON-NLS-1$
 		manager.add(new Separator("group.launch")); //$NON-NLS-1$
 		manager.add(new GroupMarker("group.launch.rundebug")); //$NON-NLS-1$
-		manager.add(new GroupMarker("group.launch.modes")); //$NON-NLS-1$
 		manager.add(new GroupMarker("group.launch.additions")); //$NON-NLS-1$
-
-		manager.add(new Separator("group.showIn")); //$NON-NLS-1$
-		if (hasShowInSystemManagementAction()) {
-			manager.add(new CommandContributionItem(new CommandContributionItemParameter(PlatformUI.getWorkbench(),
-                        "org.eclipse.tcf.te.ui.views.command.showIn.systemManagement", //$NON-NLS-1$
-                        "org.eclipse.tcf.te.ui.command.showIn.systemManagement", //$NON-NLS-1$
-						  CommandContributionItem.STYLE_PUSH)));
-		}
-
-		manager.add(new Separator("group.save")); //$NON-NLS-1$
-		// If the page should have an apply button, add one to the toolbar
-		if (hasApplyAction()) {
-			manager.add(new CommandContributionItem(new CommandContributionItemParameter(PlatformUI.getWorkbench(),
-	                        "org.eclipse.tcf.te.ui.views.command.save", //$NON-NLS-1$
-	                        "org.eclipse.ui.file.save", //$NON-NLS-1$
-							  CommandContributionItem.STYLE_PUSH)));
-		}
-
+		manager.add(new Separator("group.additions")); //$NON-NLS-1$
+		manager.add(new Separator("group.additions.control")); //$NON-NLS-1$
 		manager.add(new Separator("group.help")); //$NON-NLS-1$
 		// If the page is associated with a context help id, add a default
 		// help action button into the toolbar
@@ -266,14 +247,17 @@ public abstract class AbstractCustomFormToolkitEditorPage extends AbstractEditor
 			if (helpAction != null) manager.add(helpAction);
 		}
 
-		manager.add(new GroupMarker("group.additions")); //$NON-NLS-1$
-
 		final MenuManager mgr = new MenuManager();
+		mgr.add(new Separator("group.launch")); //$NON-NLS-1$
+		mgr.add(new GroupMarker("group.launch.rundebug")); //$NON-NLS-1$
+		mgr.add(new Separator("group.launch.additions")); //$NON-NLS-1$
+		mgr.add(new Separator("group.delete")); //$NON-NLS-1$
+		mgr.add(new Separator("group.additions")); //$NON-NLS-1$
 		final IMenuService service = (IMenuService) getSite().getService(IMenuService.class);
 		if (service != null) {
 			service.populateContributionManager(mgr, "menu:" + AbstractCustomFormToolkitEditorPage.this.getId()); //$NON-NLS-1$
 		}
-		if (mgr.getSize() > 0) {
+		if (mgr.getSize() > 5) {
 			toolBarManager.add(new ControlContribution("toolbarmenu") { //$NON-NLS-1$
 				@Override
 				protected Control createControl(Composite parent) {
@@ -284,6 +268,11 @@ public abstract class AbstractCustomFormToolkitEditorPage extends AbstractEditor
 						@Override
 						public void widgetSelected(SelectionEvent e) {
 							MenuManager mgr = new MenuManager();
+							mgr.add(new Separator("group.launch")); //$NON-NLS-1$
+							mgr.add(new GroupMarker("group.launch.rundebug")); //$NON-NLS-1$
+							mgr.add(new Separator("group.launch.additions")); //$NON-NLS-1$
+							mgr.add(new Separator("group.delete")); //$NON-NLS-1$
+							mgr.add(new Separator("group.additions")); //$NON-NLS-1$
 							service.populateContributionManager(mgr, "menu:" + AbstractCustomFormToolkitEditorPage.this.getId()); //$NON-NLS-1$
 							Menu menu = mgr.createContextMenu(tb);
 							menu.setVisible(true);
@@ -307,30 +296,6 @@ public abstract class AbstractCustomFormToolkitEditorPage extends AbstractEditor
 	}
 
 	/**
-	 * Returns if or if not the page should have an
-	 * ShowInSystemManagementView button in the toolbar.
-	 * <p>
-	 * The default implementation returns <code>true</code>.
-	 *
-	 * @return <code>True</code> if the page does have an ShowInSystemManagementView button, <code>false</code> otherwise.
-	 */
-	protected boolean hasShowInSystemManagementAction() {
-		return true;
-	}
-
-	/**
-	 * Returns if or if not the page should have an apply button in
-	 * the toolbar.
-	 * <p>
-	 * The default implementation returns <code>false</code>.
-	 *
-	 * @return <code>True</code> if the page does have an apply button, <code>false</code> otherwise.
-	 */
-	protected boolean hasApplyAction() {
-		return false;
-	}
-
-	/**
 	 * Do create the managed form content.
 	 *
 	 * @param parent The parent composite. Must not be <code>null</code>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/editor/pages/TreeViewerExplorerEditorPage.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/editor/pages/TreeViewerExplorerEditorPage.java
index eb8b49408..b062ba0cc 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/editor/pages/TreeViewerExplorerEditorPage.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/editor/pages/TreeViewerExplorerEditorPage.java
@@ -141,8 +141,8 @@ public abstract class TreeViewerExplorerEditorPage extends AbstractCustomFormToo
 	@Override
     protected void createToolbarContributionItems(IToolBarManager manager) {
 	    this.toolbarMgr = manager;
-	    treeControl.createToolbarContributionItems(manager);
 	    super.createToolbarContributionItems(manager);
+	    treeControl.createToolbarContributionItems(manager);
 	}
 
 	/* (non-Javadoc)
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/trees/AbstractTreeControl.java b/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/trees/AbstractTreeControl.java
index 0938ac646..fdc03f1b1 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/trees/AbstractTreeControl.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/trees/AbstractTreeControl.java
@@ -647,8 +647,9 @@ public abstract class AbstractTreeControl extends WorkbenchPartControl implement
 	 * @param toolbarManager The toolbar to add the toolbar items too. Must not be <code>null</code>.
 	 */
 	public void createToolbarContributionItems(IToolBarManager toolbarManager) {
-		toolbarManager.add(new CollapseAllAction(this));
-		toolbarManager.add(configFilterAction = new ConfigFilterAction(this));
+		toolbarManager.insertAfter("group.additions.control", new CollapseAllAction(this)); //$NON-NLS-1$
+		configFilterAction = new ConfigFilterAction(this);
+		toolbarManager.insertAfter("group.additions.control", configFilterAction); //$NON-NLS-1$
 	}
 
 	/**