https://bugs.eclipse.org/bugs/show_bug.cgi?id=170160
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/plugin.properties b/jsf/plugins/org.eclipse.jst.pagedesigner/plugin.properties
index 9471634..b845830 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/plugin.properties
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/plugin.properties
@@ -19,5 +19,7 @@
Resource_Contributions_Extension.name=Resource
PaletteItem_Config_Contributions_Extension.name= PaletteItem Config Contributions
+editor.binding.context.name=Web Page Editor Editor Binding Context
+editor.binding.context.description=Binding Context Used When Editing Using Web Page Editor
# ====================================================================
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/plugin.xml b/jsf/plugins/org.eclipse.jst.pagedesigner/plugin.xml
index e517e48..457d61f 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/plugin.xml
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/plugin.xml
@@ -78,19 +78,19 @@
<extension point="org.eclipse.ui.bindings">
<key commandId="org.eclipse.jst.pagedesigner.vertical"
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- contextId="org.eclipse.ui.contexts.window"
+ contextId="org.eclipse.jst.pagedesigner.editorContext"
sequence="M1+M2+F9"/>
<key commandId="org.eclipse.jst.pagedesigner.horizotal"
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- contextId="org.eclipse.ui.contexts.window"
+ contextId="org.eclipse.jst.pagedesigner.editorContext"
sequence="M1+M2+F10"/>
<key commandId="org.eclipse.jst.pagedesigner.design"
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- contextId="org.eclipse.ui.contexts.window"
+ contextId="org.eclipse.jst.pagedesigner.editorContext"
sequence="M1+M2+F11"/>
<key commandId="org.eclipse.jst.pagedesigner.source"
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- contextId="org.eclipse.ui.contexts.window"
+ contextId="org.eclipse.jst.pagedesigner.editorContext"
sequence="M1+M2+F12"/>
</extension>
@@ -125,4 +125,13 @@
translatorClass="org.eclipse.jst.pagedesigner.editors.palette.internal.metadata.HTMLContentModelMetaDataTranslator">
</domainSourceModelTypeTranslator>
</extension>
+ <extension
+ point="org.eclipse.ui.contexts">
+ <context
+ description="%editor.binding.context.description"
+ id="org.eclipse.jst.pagedesigner.editorContext"
+ name="%editor.binding.context.name"
+ parentId="org.eclipse.ui.textEditorScope">
+ </context>
+ </extension>
</plugin>
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/HTMLEditor.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/HTMLEditor.java
index b1a6b2a..98f516f 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/HTMLEditor.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/HTMLEditor.java
@@ -67,6 +67,7 @@
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.contexts.IContextService;
import org.eclipse.ui.ide.IGotoMarker;
import org.eclipse.ui.part.MultiPageSelectionProvider;
import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
@@ -722,6 +723,13 @@
IWorkbenchWindow window = getSite().getWorkbenchWindow();
window.getPartService().addPartListener(_partListener);
window.getShell().addShellListener(_partListener);
+
+ // TODO: is this the right place to do this?
+ // enable our editor context
+ IContextService contextService = (IContextService) getSite()
+ .getService(IContextService.class);
+ contextService.activateContext("org.eclipse.jst.pagedesigner.editorContext");
+
} catch (Exception e) {
// Error in editor initialization
_log.error("Error.HTMLEditor.5", e); //$NON-NLS-1$