diff options
3 files changed, 19 insertions, 37 deletions
diff --git a/plugins/org.eclipse.etrice.ui.commands/plugin.xml b/plugins/org.eclipse.etrice.ui.commands/plugin.xml index f429711d7..8d7700333 100644 --- a/plugins/org.eclipse.etrice.ui.commands/plugin.xml +++ b/plugins/org.eclipse.etrice.ui.commands/plugin.xml @@ -96,6 +96,23 @@ </with> </activeWhen> </handler> + <handler + class="org.eclipse.etrice.ui.commands.handlers.OpenDeclaration" + commandId="org.eclipse.jdt.ui.edit.text.java.open.editor"> + <activeWhen> + <with + variable="activeEditorId"> + <or> + <equals + value="org.eclipse.etrice.ui.behavior.editor.BehaviorEditor"> + </equals> + <equals + value="org.eclipse.etrice.ui.structure.editor.StructureEditor"> + </equals> + </or> + </with> + </activeWhen> + </handler> </extension> <extension point="org.eclipse.ui.bindings"> @@ -117,12 +134,6 @@ sequence="M3+M" schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"> </key> - <key - commandId="org.eclipse.xtext.ui.editor.hyperlinking.OpenDeclaration" - contextId="org.eclipse.etrice.ui.common.base.context" - schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" - sequence="F3"> - </key> </extension> <extension point="org.eclipse.ui.menus"> @@ -210,25 +221,5 @@ </command> </menuContribution> </extension> - <extension - point="org.eclipse.ui.handlers"> - <handler - class="org.eclipse.etrice.ui.commands.handlers.OpenDeclaration" - commandId="org.eclipse.xtext.ui.editor.hyperlinking.OpenDeclaration"> - <activeWhen> - <with - variable="activeEditorId"> - <or> - <equals - value="org.eclipse.etrice.ui.behavior.editor.BehaviorEditor"> - </equals> - <equals - value="org.eclipse.etrice.ui.structure.editor.StructureEditor"> - </equals> - </or> - </with> - </activeWhen> - </handler> - </extension> </plugin> diff --git a/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/editor/DiagramEditorBase.java b/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/editor/DiagramEditorBase.java index 15f5bc95d..47af71873 100644 --- a/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/editor/DiagramEditorBase.java +++ b/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/editor/DiagramEditorBase.java @@ -83,8 +83,6 @@ public abstract class DiagramEditorBase extends DiagramEditor implements IInputU this.inputUri = ((IDiagramEditorInput) newInput).getUri(); super.init(site, input); - - getWorkbench().getService(IContextService.class).activateContext(CONTEXT_ID); } @Override @@ -160,7 +158,8 @@ public abstract class DiagramEditorBase extends DiagramEditor implements IInputU } superClassListener = new SuperClassListener(this, textEditorClass); - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getPartService().addPartListener(superClassListener); + getWorkbench().getActiveWorkbenchWindow().getPartService().addPartListener(superClassListener); + getWorkbench().getService(IContextService.class).activateContext(CONTEXT_ID); /* we have to save here whether changes have been done or not to get rid of the dirty state * CAUTION: save in diff --git a/plugins/org.eclipse.etrice.ui.structure/plugin.xml b/plugins/org.eclipse.etrice.ui.structure/plugin.xml index af3481408..6421078d3 100644 --- a/plugins/org.eclipse.etrice.ui.structure/plugin.xml +++ b/plugins/org.eclipse.etrice.ui.structure/plugin.xml @@ -68,13 +68,5 @@ editor_id="org.eclipse.etrice.ui.structure.editor.StructureEditor"> </participant> </extension> - <extension - point="org.eclipse.ui.contexts"> - <context - id="org.eclipse.etrice.ui.structure.editor.structureEditor" - name="ROOM Structure Editor" - parentId="org.eclipse.graphiti.ui.diagramEditor"> - </context> - </extension> </plugin> |