aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Rolka2013-08-21 10:11:18 (EDT)
committerDaniel Rolka2013-08-21 10:11:18 (EDT)
commit68e5bff4d7d5b9d69c5ad0eed8617d17c3ee8d10 (patch)
tree3dd61d505e0bba67c943c5f2c662267f43d36212
parent31e2523f4e376302450287df60e0c8965abc72d6 (diff)
downloadeclipse.platform.ui-68e5bff4d7d5b9d69c5ad0eed8617d17c3ee8d10.zip
eclipse.platform.ui-68e5bff4d7d5b9d69c5ad0eed8617d17c3ee8d10.tar.gz
eclipse.platform.ui-68e5bff4d7d5b9d69c5ad0eed8617d17c3ee8d10.tar.bz2
Bug 415579 - Key bindings for custom context no longer works andrefs/changes/15/15715/1
conflicts are reported 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.java16
1 files changed, 12 insertions, 4 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 48888d6..168424d 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,10 +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));
- }
+ configureShell(getShell(), windowContext);
initializeDefaultServices();
@@ -705,6 +702,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;