Fixed: [Issue 17] "Open terminal here" not available in Navigator view
diff --git a/com.google.eclipse.terminal.local.feature/feature.xml b/com.google.eclipse.terminal.local.feature/feature.xml
index 6567408..3e9eed0 100644
--- a/com.google.eclipse.terminal.local.feature/feature.xml
+++ b/com.google.eclipse.terminal.local.feature/feature.xml
@@ -1,92 +1,84 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
- id="com.google.eclipse.terminal.local"
- label="%featureName"
- version="1.1.0.qualifier"
- provider-name="%providerName">
-
- <description url="https://code.google.com/p/elt/">
- %description
- </description>
-
- <copyright>
- %description
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://elt.googlecode.com/git/update-site"/>
- </url>
-
- <requires>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.core.runtime" version="3.7.0" match="compatible"/>
- <import plugin="com.ibm.icu" version="4.4.2" match="greaterOrEqual"/>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.debug.core"/>
- <import plugin="org.eclipse.jface.text"/>
- </requires>
-
- <plugin
- id="com.google.eclipse.cdt.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="com.google.eclipse.terminal.local"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="com.google.eclipse.tm.terminal"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="com.google.eclipse.cdt.core.macosx"
- os="macosx"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-
- <plugin
- id="com.google.eclipse.cdt.core.linux"
- os="linux"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-
- <plugin
- id="com.google.eclipse.cdt.core.linux.x86"
- os="linux"
- arch="x86"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-
- <plugin
- id="com.google.eclipse.cdt.core.linux.x86_64"
- os="linux"
- arch="x86_64"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-
-</feature>
+ id="com.google.eclipse.terminal.local"
+ label="%featureName"
+ version="1.1.0.qualifier"
+ provider-name="%providerName">
+ <description url="https://code.google.com/p/elt/"> %description
+ </description>
+ <copyright> %description
+ </copyright>
+ <license url="%licenseURL"> %license
+ </license>
+ <url>
+ <update
+ label="%updateSiteName"
+ url="http://elt.googlecode.com/git/update-site" />
+ </url>
+ <requires>
+ <import plugin="org.eclipse.core.resources" />
+ <import
+ plugin="org.eclipse.core.runtime"
+ version="3.7.0"
+ match="compatible" />
+ <import
+ plugin="com.ibm.icu"
+ version="4.4.2"
+ match="greaterOrEqual" />
+ <import plugin="org.eclipse.ui" />
+ <import plugin="org.eclipse.debug.core" />
+ <import plugin="org.eclipse.jface.text" />
+ </requires>
+ <plugin
+ id="com.google.eclipse.cdt.core"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false" />
+ <plugin
+ id="com.google.eclipse.terminal.local"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false" />
+ <plugin
+ id="com.google.eclipse.tm.terminal"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false" />
+ <plugin
+ id="com.google.eclipse.cdt.core.macosx"
+ os="macosx"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"
+ unpack="false" />
+ <plugin
+ id="com.google.eclipse.cdt.core.linux"
+ os="linux"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"
+ unpack="false" />
+ <plugin
+ id="com.google.eclipse.cdt.core.linux.x86"
+ os="linux"
+ arch="x86"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"
+ unpack="false" />
+ <plugin
+ id="com.google.eclipse.cdt.core.linux.x86_64"
+ os="linux"
+ arch="x86_64"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"
+ unpack="false" />
+</feature>
\ No newline at end of file
diff --git a/com.google.eclipse.terminal.local/plugin.xml b/com.google.eclipse.terminal.local/plugin.xml
index 6be0eda..cdc5bbf 100644
--- a/com.google.eclipse.terminal.local/plugin.xml
+++ b/com.google.eclipse.terminal.local/plugin.xml
@@ -1,153 +1,135 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<plugin>
- <extension
- point="org.eclipse.ui.views">
+ <extension point="org.eclipse.ui.views">
+ <view
+ allowMultiple="true"
+ category="org.eclipse.ui"
+ class="com.google.eclipse.terminal.local.ui.view.TerminalView"
+ icon="icons/terminal.gif"
+ id="com.google.eclipse.terminal.local.localTerminalView"
+ name="Terminal"
+ restorable="true">
+ </view>
+ </extension>
+ <extension point="org.eclipse.ui.perspectiveExtensions">
+ <perspectiveExtension targetID="*">
<view
- allowMultiple="true"
- category="org.eclipse.ui"
- class="com.google.eclipse.terminal.local.ui.view.TerminalView"
- icon="icons/terminal.gif"
- id="com.google.eclipse.terminal.local.localTerminalView"
- name="Terminal"
- restorable="true">
+ id="com.google.eclipse.terminal.local.localTerminalView"
+ minimized="false"
+ relationship="stack"
+ relative="org.eclipse.ui.console.ConsoleView">
</view>
- </extension>
- <extension
- point="org.eclipse.ui.perspectiveExtensions">
- <perspectiveExtension
- targetID="*">
- <view
- id="com.google.eclipse.terminal.local.localTerminalView"
- minimized="false"
- relationship="stack"
- relative="org.eclipse.ui.console.ConsoleView">
- </view>
- </perspectiveExtension>
- </extension>
- <extension
- point="org.eclipse.ui.preferencePages">
- <page
- category="com.google.eclipse.terminal.local.page.root"
- class="com.google.eclipse.terminal.local.ui.preferences.ColorsAndFontsPreferencePage"
- id="com.google.eclipse.terminal.local.page.colorsAndFonts"
- name="Colors and Fonts">
- </page>
- <page
- class="com.google.eclipse.terminal.local.ui.preferences.RootPreferencePage"
- id="com.google.eclipse.terminal.local.page.root"
- name="Terminal">
- </page>
- </extension>
- <extension
- point="org.eclipse.core.runtime.preferences">
- <initializer
- class="com.google.eclipse.terminal.local.ui.preferences.PreferenceInitializer">
- </initializer>
- </extension>
- <extension
- point="org.eclipse.ui.commands">
+ </perspectiveExtension>
+ </extension>
+ <extension point="org.eclipse.ui.preferencePages">
+ <page
+ category="com.google.eclipse.terminal.local.page.root"
+ class="com.google.eclipse.terminal.local.ui.preferences.ColorsAndFontsPreferencePage"
+ id="com.google.eclipse.terminal.local.page.colorsAndFonts"
+ name="Colors and Fonts">
+ </page>
+ <page
+ class="com.google.eclipse.terminal.local.ui.preferences.RootPreferencePage"
+ id="com.google.eclipse.terminal.local.page.root"
+ name="Terminal">
+ </page>
+ </extension>
+ <extension point="org.eclipse.core.runtime.preferences">
+ <initializer class="com.google.eclipse.terminal.local.ui.preferences.PreferenceInitializer">
+ </initializer>
+ </extension>
+ <extension point="org.eclipse.ui.commands">
+ <command
+ categoryId="org.eclipse.ui.category.views"
+ id="com.google.eclipse.terminal.local.open"
+ name="Open Terminal Here">
+ </command>
+ </extension>
+ <extension point="org.eclipse.ui.commandImages">
+ <image
+ commandId="com.google.eclipse.terminal.local.open"
+ icon="icons/terminal.gif">
+ </image>
+ </extension>
+ <extension point="org.eclipse.ui.menus">
+ <menuContribution
+ allPopups="false"
+ locationURI="popup:org.eclipse.ui.popup.any?after=additions">
<command
- categoryId="org.eclipse.ui.category.views"
- id="com.google.eclipse.terminal.local.open"
- name="Open Terminal Here">
+ commandId="com.google.eclipse.terminal.local.open"
+ style="push">
+ <visibleWhen checkEnabled="false">
+ <and>
+ <with variable="selection">
+ <count value="1">
+ </count>
+ </with>
+ <iterate>
+ <adapt type="org.eclipse.core.resources.IResource">
+ </adapt>
+ </iterate>
+ </and>
+ </visibleWhen>
</command>
- </extension>
- <extension
- point="org.eclipse.ui.commandImages">
- <image
- commandId="com.google.eclipse.terminal.local.open"
- icon="icons/terminal.gif">
- </image>
- </extension>
- <extension
- point="org.eclipse.ui.menus">
- <menuContribution
- allPopups="false"
- locationURI="popup:org.eclipse.ui.popup.any?after=group.open">
- <command
- commandId="com.google.eclipse.terminal.local.open"
- style="push">
- <visibleWhen
- checkEnabled="false">
- <and>
- <with
- variable="selection">
- <count
- value="1">
- </count>
- </with>
- <iterate>
- <adapt
- type="org.eclipse.core.resources.IResource">
- </adapt>
- </iterate>
- </and>
- </visibleWhen>
- </command>
- </menuContribution>
- </extension>
- <extension
- point="org.eclipse.ui.handlers">
- <handler
- class="com.google.eclipse.terminal.local.ui.command.OpenTerminalCommand"
- commandId="com.google.eclipse.terminal.local.open">
- </handler>
- </extension>
- <extension
- point="org.eclipse.ui.contexts">
- <context
- description="In Terminal"
- id="com.google.eclipse.terminal.local.context.localTerminal"
- name="Terminal"
- parentId="org.eclipse.ui.contexts.window">
- </context>
- </extension>
- <extension
- point="org.eclipse.ui.commands">
- <category
- id="com.google.eclipse.terminal.local.commands.category"
- name="Terminal">
- </category>
- <command
- categoryId="com.google.eclipse.terminal.local.commands.category"
- id="com.google.eclipse.terminal.local.copy"
- name="Copy">
- </command>
- <command
- categoryId="com.google.eclipse.terminal.local.commands.category"
- id="com.google.eclipse.terminal.local.paste"
- name="Paste">
- </command>
- </extension>
- <extension
- point="org.eclipse.ui.bindings">
- <key
- commandId="com.google.eclipse.terminal.local.copy"
- contextId="com.google.eclipse.terminal.local.context.localTerminal"
- platform="carbon"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- sequence="M1+C">
- </key>
- <key
- commandId="com.google.eclipse.terminal.local.copy"
- contextId="com.google.eclipse.terminal.local.context.localTerminal"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- sequence="M1+M2+C">
- </key>
- <key
- commandId="com.google.eclipse.terminal.local.paste"
- contextId="com.google.eclipse.terminal.local.context.localTerminal"
- platform="carbon"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- sequence="M1+V">
- </key>
- <key
- commandId="com.google.eclipse.terminal.local.paste"
- contextId="com.google.eclipse.terminal.local.context.localTerminal"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- sequence="M1+M2+V">
- </key>
- </extension>
-
-</plugin>
+ </menuContribution>
+ </extension>
+ <extension point="org.eclipse.ui.handlers">
+ <handler
+ class="com.google.eclipse.terminal.local.ui.command.OpenTerminalCommand"
+ commandId="com.google.eclipse.terminal.local.open">
+ </handler>
+ </extension>
+ <extension point="org.eclipse.ui.contexts">
+ <context
+ description="In Terminal"
+ id="com.google.eclipse.terminal.local.context.localTerminal"
+ name="Terminal"
+ parentId="org.eclipse.ui.contexts.window">
+ </context>
+ </extension>
+ <extension point="org.eclipse.ui.commands">
+ <category
+ id="com.google.eclipse.terminal.local.commands.category"
+ name="Terminal">
+ </category>
+ <command
+ categoryId="com.google.eclipse.terminal.local.commands.category"
+ id="com.google.eclipse.terminal.local.copy"
+ name="Copy">
+ </command>
+ <command
+ categoryId="com.google.eclipse.terminal.local.commands.category"
+ id="com.google.eclipse.terminal.local.paste"
+ name="Paste">
+ </command>
+ </extension>
+ <extension point="org.eclipse.ui.bindings">
+ <key
+ commandId="com.google.eclipse.terminal.local.copy"
+ contextId="com.google.eclipse.terminal.local.context.localTerminal"
+ platform="carbon"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="M1+C">
+ </key>
+ <key
+ commandId="com.google.eclipse.terminal.local.copy"
+ contextId="com.google.eclipse.terminal.local.context.localTerminal"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="M1+M2+C">
+ </key>
+ <key
+ commandId="com.google.eclipse.terminal.local.paste"
+ contextId="com.google.eclipse.terminal.local.context.localTerminal"
+ platform="carbon"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="M1+V">
+ </key>
+ <key
+ commandId="com.google.eclipse.terminal.local.paste"
+ contextId="com.google.eclipse.terminal.local.context.localTerminal"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="M1+M2+V">
+ </key>
+ </extension>
+</plugin>
\ No newline at end of file
diff --git a/com.google.eclipse.tm.terminal/plugin.xml b/com.google.eclipse.tm.terminal/plugin.xml
index b4e5ef0..90b888a 100644
--- a/com.google.eclipse.tm.terminal/plugin.xml
+++ b/com.google.eclipse.tm.terminal/plugin.xml
@@ -2,104 +2,92 @@
<?eclipse version="3.0"?>
<!--
# Copyright (c) 2006, 2008 Wind River Systems, Inc. and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Michael Scharf (Wind River) - initial API and implementation
-# Martin Oberhuber (Wind River) - fixed copyright headers and beautified
-# Michael Scharf (Wind River) - [237425] undefined tm.terminal command
+# All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse
+# Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
-->
<plugin>
- <extension point="org.eclipse.ui.contexts">
- <context
- name="%terminal.context.name"
- description="%terminal.context.description"
- id="org.eclipse.tm.terminal.TerminalContext"
- />
- </extension>
- <extension
- point="org.eclipse.ui.commands">
- <!-- Dummy commands for bindings, see below -->
- <command
- categoryId="org.eclipse.tm.terminal.category1"
- id="org.eclipse.tm.terminal.command1"
- name="%terminal.insertion.name"/>
- <category
- description="%terminal.view.insertion.description"
- id="org.eclipse.tm.terminal.category1"
- name="%terminal.insertion.category.name"/>
- </extension>
- <extension
- point="org.eclipse.ui.bindings">
- <!--
- These keybindings are needed to disable the menu-activation keys (e.g.,
- Alt-F for the File menu, etc.). The code in method
- TerminalControl.TerminalFocusListener.focusGained() disables the Eclipse key
- binding service, but it doesn't disable the global menu-activation
- keys.
- -->
- <key
- commandId="org.eclipse.tm.terminal.command1"
- contextId="org.eclipse.tm.terminal.TerminalContext"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- sequence="Alt+A"/> <!-- Search -->
- <key
- commandId="org.eclipse.tm.terminal.command1"
- contextId="org.eclipse.tm.terminal.TerminalContext"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- sequence="Alt+E"/> <!-- Edit -->
- <key
- commandId="org.eclipse.tm.terminal.command1"
- contextId="org.eclipse.tm.terminal.TerminalContext"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- sequence="Alt+F"/> <!-- File -->
- <key
- commandId="org.eclipse.tm.terminal.command1"
- contextId="org.eclipse.tm.terminal.TerminalContext"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- sequence="Alt+G"/>
- <key
- commandId="org.eclipse.tm.terminal.command1"
- contextId="org.eclipse.tm.terminal.TerminalContext"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- sequence="Alt+H"/> <!-- Help -->
- <key
- commandId="org.eclipse.tm.terminal.command1"
- contextId="org.eclipse.tm.terminal.TerminalContext"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- sequence="Alt+N"/> <!-- Navigate -->
- <key
- commandId="org.eclipse.tm.terminal.command1"
- contextId="org.eclipse.tm.terminal.TerminalContext"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- sequence="Alt+P"/> <!-- Project -->
- <key
- commandId="org.eclipse.tm.terminal.command1"
- contextId="org.eclipse.tm.terminal.TerminalContext"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- sequence="Alt+R"/> <!-- Run -->
- <key
- commandId="org.eclipse.tm.terminal.command1"
- contextId="org.eclipse.tm.terminal.TerminalContext"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- sequence="Alt+S"/> <!-- Source -->
- <key
- commandId="org.eclipse.tm.terminal.command1"
- contextId="org.eclipse.tm.terminal.TerminalContext"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- sequence="Alt+T"/> <!-- Refactor -->
- <key
- commandId="org.eclipse.tm.terminal.command1"
- contextId="org.eclipse.tm.terminal.TerminalContext"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- sequence="Alt+V"/> <!-- CVS -->
- <key
- commandId="org.eclipse.tm.terminal.command1"
- contextId="org.eclipse.tm.terminal.TerminalContext"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- sequence="Alt+W"/> <!-- Window -->
- </extension>
-</plugin>
+ <extension point="org.eclipse.ui.contexts">
+ <context
+ name="%terminal.context.name"
+ description="%terminal.context.description"
+ id="org.eclipse.tm.terminal.TerminalContext" />
+ </extension>
+ <extension point="org.eclipse.ui.commands">
+ <!-- Dummy commands for bindings, see below -->
+ <command
+ categoryId="org.eclipse.tm.terminal.category1"
+ id="org.eclipse.tm.terminal.command1"
+ name="%terminal.insertion.name" />
+ <category
+ description="%terminal.view.insertion.description"
+ id="org.eclipse.tm.terminal.category1"
+ name="%terminal.insertion.category.name" />
+ </extension>
+ <extension point="org.eclipse.ui.bindings">
+ <!--
+ These keybindings are needed to disable the menu-activation keys (e.g., Alt-F for the File menu, etc.). The code
+ in method TerminalControl.TerminalFocusListener.focusGained() disables the Eclipse key binding service, but it
+ doesn't disable the global menu-activation keys.
+ -->
+ <key
+ commandId="org.eclipse.tm.terminal.command1"
+ contextId="org.eclipse.tm.terminal.TerminalContext"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="Alt+A" /> <!-- Search -->
+ <key
+ commandId="org.eclipse.tm.terminal.command1"
+ contextId="org.eclipse.tm.terminal.TerminalContext"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="Alt+E" /> <!-- Edit -->
+ <key
+ commandId="org.eclipse.tm.terminal.command1"
+ contextId="org.eclipse.tm.terminal.TerminalContext"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="Alt+F" /> <!-- File -->
+ <key
+ commandId="org.eclipse.tm.terminal.command1"
+ contextId="org.eclipse.tm.terminal.TerminalContext"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="Alt+G" />
+ <key
+ commandId="org.eclipse.tm.terminal.command1"
+ contextId="org.eclipse.tm.terminal.TerminalContext"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="Alt+H" /> <!-- Help -->
+ <key
+ commandId="org.eclipse.tm.terminal.command1"
+ contextId="org.eclipse.tm.terminal.TerminalContext"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="Alt+N" /> <!-- Navigate -->
+ <key
+ commandId="org.eclipse.tm.terminal.command1"
+ contextId="org.eclipse.tm.terminal.TerminalContext"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="Alt+P" /> <!-- Project -->
+ <key
+ commandId="org.eclipse.tm.terminal.command1"
+ contextId="org.eclipse.tm.terminal.TerminalContext"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="Alt+R" /> <!-- Run -->
+ <key
+ commandId="org.eclipse.tm.terminal.command1"
+ contextId="org.eclipse.tm.terminal.TerminalContext"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="Alt+S" /> <!-- Source -->
+ <key
+ commandId="org.eclipse.tm.terminal.command1"
+ contextId="org.eclipse.tm.terminal.TerminalContext"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="Alt+T" /> <!-- Refactor -->
+ <key
+ commandId="org.eclipse.tm.terminal.command1"
+ contextId="org.eclipse.tm.terminal.TerminalContext"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="Alt+V" /> <!-- CVS -->
+ <key
+ commandId="org.eclipse.tm.terminal.command1"
+ contextId="org.eclipse.tm.terminal.TerminalContext"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="Alt+W" /> <!-- Window -->
+ </extension>
+</plugin>
\ No newline at end of file
