aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Rolka2013-08-20 10:50:15 (EDT)
committerGerrit Code Review @ Eclipse.org2013-08-21 09:08:27 (EDT)
commit0c314f51dca6c35de4cea8eb977fa5d3bf2132cb (patch)
tree69f60ad3a41abb6663ae9f6897d30c3b1080901c
parentde8bd0c0ef9e68298e924a12b18ca39de664e714 (diff)
downloadeclipse.platform.ui-0c314f51dca6c35de4cea8eb977fa5d3bf2132cb.zip
eclipse.platform.ui-0c314f51dca6c35de4cea8eb977fa5d3bf2132cb.tar.gz
eclipse.platform.ui-0c314f51dca6c35de4cea8eb977fa5d3bf2132cb.tar.bz2
Bug 387951 - Key bindings for custom context no longer works andrefs/changes/34/14134/5
conflicts are reported Change-Id: Id9db345a436f12648392c4fd1f55f38924ce94bc Signed-off-by: Daniel Rolka <daniel.rolka@pl.ibm.com>
-rw-r--r--bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java17
1 files changed, 12 insertions, 5 deletions
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java
index f034e11..ccff10a 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java
@@ -566,11 +566,7 @@ public class WorkbenchWindow implements IWorkbenchWindow {
cs.activateContext(IContextService.CONTEXT_ID_WINDOW);
cs.getActiveContextIds();
- String title = getWindowConfigurer().basicGetTitle();
- if (title != null) {
- getShell().setText(TextProcessor.process(title, TEXT_DELIMITERS));
- }
- workbench.getHelpSystem().setHelp(getShell(), IWorkbenchHelpContextIds.WORKBENCH_WINDOW);
+ configureShell(getShell(), windowContext);
initializeDefaultServices();
@@ -705,6 +701,17 @@ public class WorkbenchWindow implements IWorkbenchWindow {
trackShellActivation();
}
+ private void configureShell(Shell shell, IEclipseContext context) {
+ String title = getWindowConfigurer().basicGetTitle();
+ if (title != null) {
+ shell.setText(TextProcessor.process(title, TEXT_DELIMITERS));
+ }
+ workbench.getHelpSystem().setHelp(shell, IWorkbenchHelpContextIds.WORKBENCH_WINDOW);
+
+ IContextService contextService = context.get(IContextService.class);
+ contextService.registerShell(shell, IContextService.TYPE_WINDOW);
+ }
+
private boolean manageChanges = true;
private boolean canUpdateMenus = true;