[206635] Key bindings
diff --git a/plugins/org.eclipse.wst.server.ui/plugin.properties b/plugins/org.eclipse.wst.server.ui/plugin.properties
index 9c30d17..e292c04 100644
--- a/plugins/org.eclipse.wst.server.ui/plugin.properties
+++ b/plugins/org.eclipse.wst.server.ui/plugin.properties
@@ -22,6 +22,7 @@
# --------------- Wizards and Views ---------------
category=Server
+context=In Servers View
newServer=Server
newServerDescription=Define a new server
@@ -35,9 +36,15 @@
# Run on Server actions
actionRunOnServer=Run on Server
+actionRunOnServerDescription=Run the current selection on server
actionDebugOnServer=Debug on Server
-actionProfileOnServer=Profile on Server
+actionDebugOnServerDescription=Debug the current selection on server
actionPublish=Publish
+actionPublishDescription=Publish to server
+actionRun=Run
+actionRunDescription=Run server
+actionDebug=Debug
+actionDebugDescription=Debug server
# --------------- Preferences and Property pages ---------------
diff --git a/plugins/org.eclipse.wst.server.ui/plugin.xml b/plugins/org.eclipse.wst.server.ui/plugin.xml
index 4307dbb..60ea462 100644
--- a/plugins/org.eclipse.wst.server.ui/plugin.xml
+++ b/plugins/org.eclipse.wst.server.ui/plugin.xml
@@ -352,6 +352,50 @@
</extension>
-->
+<extension point="org.eclipse.ui.commands">
+ <category
+ id="org.eclipse.wst.server.ui"
+ name="%category"
+ description="%category"/>
+ <command
+ id="org.eclipse.wst.server.launchShortcut.run"
+ name="%actionRunOnServer"
+ description="%actionRunOnServerDescription"
+ categoryId="org.eclipse.debug.ui.category.run"/>
+ <command
+ id="org.eclipse.wst.server.launchShortcut.debug"
+ name="%actionDebugOnServer"
+ description="%actionDebugOnServerDescription"
+ categoryId="org.eclipse.debug.ui.category.run"/>
+ <command
+ id="org.eclipse.wst.server.run"
+ name="%actionRun"
+ description="%actionRunDescription"
+ categoryId="org.eclipse.wst.server.ui"
+ defaultHandler="org.eclipse.wst.server.ui.internal.view.servers.ServerActionHandler"/>
+ <command
+ id="org.eclipse.wst.server.debug"
+ name="%actionDebug"
+ description="%actionDebugDescription"
+ categoryId="org.eclipse.wst.server.ui"
+ defaultHandler="org.eclipse.wst.server.ui.internal.view.servers.ServerActionHandler"/>
+ <command
+ id="org.eclipse.wst.server.publish"
+ name="%actionPublish"
+ description="%actionPublishDescription"
+ categoryId="org.eclipse.wst.server.ui"
+ defaultHandler="org.eclipse.wst.server.ui.internal.view.servers.ServerActionHandler"/>
+</extension>
+
+<extension point="org.eclipse.ui.contexts">
+ <context
+ id="org.eclipse.ui.serverViewScope"
+ name="%context"
+ description="%context"
+ parentId="org.eclipse.ui.contexts.window">
+ </context>
+</extension>
+
<!-- commands and their bindings
NOTE:
M1 = CTRL/COMMAND
@@ -359,41 +403,30 @@
M3 = ALT
M4 = Platform-specific fourth key
-->
-<extension point="org.eclipse.ui.commands">
- <command
- id="org.eclipse.wst.server.launchShortcut.debug"
- name="%actionDebugOnServer"
- description="%actionDebugOnServer"
- categoryId="org.eclipse.debug.ui.category.run"
- defaultHandler="org.eclipse.wst.server.ui.internal.view.servers.ServerActionHandler"/>
- <command
- id="org.eclipse.wst.server.launchShortcut.run"
- name="%actionRunOnServer"
- description="%actionRunOnServer"
- categoryId="org.eclipse.debug.ui.category.run"
- defaultHandler="org.eclipse.wst.server.ui.internal.view.servers.ServerActionHandler"/>
- <command
- id="org.eclipse.wst.server.publish"
- name="%actionPublish"
- description="%actionPublish"
- categoryId="org.eclipse.debug.ui.category.run"
- defaultHandler="org.eclipse.wst.server.ui.internal.view.servers.ServerActionHandler"/>
-</extension>
-
<extension point="org.eclipse.ui.bindings">
<key
- sequence="M3+M2+D R"
- contextId="org.eclipse.ui.globalScope"
- commandId="org.eclipse.wst.server.launchShortcut.debug"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
- <key
sequence="M3+M2+X R"
contextId="org.eclipse.ui.globalScope"
commandId="org.eclipse.wst.server.launchShortcut.run"
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
<key
- sequence="M3+M2+P R"
+ sequence="M3+M2+D R"
contextId="org.eclipse.ui.globalScope"
+ commandId="org.eclipse.wst.server.launchShortcut.debug"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+ <key
+ sequence="M1+M3+R"
+ contextId="org.eclipse.ui.serverViewScope"
+ commandId="org.eclipse.wst.server.run"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+ <key
+ sequence="M1+M3+D"
+ contextId="org.eclipse.ui.serverViewScope"
+ commandId="org.eclipse.wst.server.debug"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+ <key
+ sequence="M1+M3+P"
+ contextId="org.eclipse.ui.serverViewScope"
commandId="org.eclipse.wst.server.publish"
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
</extension>
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/OpenAction.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/OpenAction.java
index c51f52b..a1155f2 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/OpenAction.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/OpenAction.java
@@ -27,8 +27,8 @@
public OpenAction(ISelectionProvider sp) {
super(sp, Messages.actionOpen);
- setActionDefinitionId("org.eclipse.ui.navigator.Open");
- //setActionDefinitionId("org.eclipse.jdt.ui.edit.text.java.open.editor");
+ //setActionDefinitionId("org.eclipse.ui.navigator.Open");
+ setActionDefinitionId("org.eclipse.jdt.ui.edit.text.java.open.editor");
}
public void perform(IServer server) {
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/ServersView.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/ServersView.java
index c07b38c..de6e4f8 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/ServersView.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/ServersView.java
@@ -44,6 +44,7 @@
import org.eclipse.swt.widgets.TreeItem;
import org.eclipse.ui.*;
import org.eclipse.ui.actions.ActionFactory;
+import org.eclipse.ui.contexts.IContextService;
import org.eclipse.ui.keys.IBindingService;
import org.eclipse.ui.part.ResourceTransfer;
import org.eclipse.ui.part.ViewPart;
@@ -53,6 +54,7 @@
*/
public class ServersView extends ViewPart {
private static final String TAG_COLUMN_WIDTH = "columnWidth";
+ private static final String SERVERS_VIEW_CONTEXT = "org.eclipse.ui.serverViewScope";
protected Action noneAction = new Action(Messages.dialogMonitorNone) {
// dummy action
@@ -121,6 +123,9 @@
column3.setWidth(cols[2]);
column3.addSelectionListener(getHeaderListener(2));
+ IContextService contextSupport = (IContextService)getSite().getService(IContextService.class);
+ contextSupport.activateContext(SERVERS_VIEW_CONTEXT);
+
deferInitialization();
}
@@ -209,8 +214,7 @@
initDragAndDrop();
// init the tooltip
- ServerToolTip toolTip;
- toolTip = new ServerToolTip(treeTable);
+ ServerToolTip toolTip = new ServerToolTip(treeTable);
toolTip.setShift(new Point(-5, -5));
toolTip.setPopupDelay(200); // in ms
toolTip.setHideOnMouseDown(true);
@@ -277,7 +281,6 @@
actions[1] = new StartAction(shell, provider, ILaunchManager.RUN_MODE);
actionBars.setGlobalActionHandler("org.eclipse.wst.server.run", actions[1]);
actions[2] = new StartAction(shell, provider, ILaunchManager.PROFILE_MODE);
- actionBars.setGlobalActionHandler("org.eclipse.wst.server.profile", actions[2]);
// create the stop action
actions[3] = new StopAction(shell, provider);
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/StartAction.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/StartAction.java
index be7ceeb..59e92ea 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/StartAction.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/view/servers/StartAction.java
@@ -56,7 +56,6 @@
setImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_ELCL_START_PROFILE));
setHoverImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_CLCL_START_PROFILE));
setDisabledImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_DLCL_START_PROFILE));
- setActionDefinitionId("org.eclipse.wst.server.profile");
}
try {
selectionChanged((IStructuredSelection) selectionProvider.getSelection());
