From afed0c66f7a21348d7e6009cb16d60303a1778d9 Mon Sep 17 00:00:00 2001 From: Tobias Schwarz Date: Wed, 18 Dec 2013 13:27:10 +0100 Subject: Target Explorer: editor toolbar menu contributions --- .../AbstractLaunchTabContainerEditorPage.java | 8 --- .../org.eclipse.tcf.te.tcf.launch.ui/plugin.xml | 39 ++++++++++++++ .../AbstractTcfLaunchTabContainerEditorPage.java | 8 --- .../org.eclipse.tcf.te.tcf.processes.ui/plugin.xml | 30 +++++++++-- .../plugins/org.eclipse.tcf.te.tcf.ui/plugin.xml | 54 ++++++++++++++++++- .../ui/editor/AbstractConfigurationEditorPage.java | 8 --- .../plugins/org.eclipse.tcf.te.ui.views/plugin.xml | 45 ---------------- .../pages/AbstractCustomFormToolkitEditorPage.java | 61 +++++----------------- .../editor/pages/TreeViewerExplorerEditorPage.java | 2 +- .../tcf/te/ui/trees/AbstractTreeControl.java | 5 +- 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 @@ -68,14 +68,6 @@ public abstract class AbstractLaunchTabContainerEditorPage extends AbstractCusto super.dispose(); } - /* (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() */ 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 @@ + + - - - - + + + + + + + + + + + + + + + + + - + + + + + + + @@ -399,7 +400,8 @@ - + + @@ -414,12 +416,60 @@ args="org.eclipse.tcf.te.tcf.ui.command.debug" value="true"/> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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); @@ -306,30 +295,6 @@ public abstract class AbstractCustomFormToolkitEditorPage extends AbstractEditor return new HelpAction(contextHelpId); } - /** - * Returns if or if not the page should have an - * ShowInSystemManagementView button in the toolbar. - *

- * The default implementation returns true. - * - * @return True if the page does have an ShowInSystemManagementView button, false otherwise. - */ - protected boolean hasShowInSystemManagementAction() { - return true; - } - - /** - * Returns if or if not the page should have an apply button in - * the toolbar. - *

- * The default implementation returns false. - * - * @return True if the page does have an apply button, false otherwise. - */ - protected boolean hasApplyAction() { - return false; - } - /** * Do create the managed form content. * 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 null. */ 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$ } /** -- cgit v1.2.3