Terminals: Fix invalid category ids for view and commands

2 files changed, 46 insertions, 7 deletions

diff --git a/terminals/plugins/org.eclipse.tcf.te.ui.terminals/plugin.properties b/terminals/plugins/org.eclipse.tcf.te.ui.terminals/plugin.properties
index 509b0a050..a9d9ded22 100644
--- a/terminals/plugins/org.eclipse.tcf.te.ui.terminals/plugin.properties
+++ b/terminals/plugins/org.eclipse.tcf.te.ui.terminals/plugin.properties
@@ -8,11 +8,13 @@
 # Wind River Systems - initial API and implementation
 ##################################################################################
 
-pluginName = Target Explorer, Terminals
+pluginName = Terminals
 providerName = Eclipse.org - Target Explorer
 
 # ----- Terminals View -----
 
+ViewCategory.name=Terminals
+
 TerminalsView.name=Terminals
 TerminalsView.context.name=In Terminals View
 TerminalsView.context.description=Show modified keyboard shortcuts in context menu
@@ -26,6 +28,7 @@ TerminalConnector.streams=Streams Connector (hidden)
 StreamsLauncherDelegate.label=Streams Terminal
 
 # ----- Commands and Menu contributions -----
+command.category.name=Terminals Commands
 
 toolbar.terminal.label=Terminals
 
@@ -40,11 +43,11 @@ command.disconnect.tooltip=Disconnect Terminal Connection
 
 menu.showIn.label = Show In
 
-# ***** Extension Points *****
+# -----  Extension Points  -----
 
 ExtensionPoint.launcherDelegates.name=Terminal Launcher Delegates
 
-# ***** Activity contributions *****
+# -----  Activity contributions  -----
 
 activities.category.terminals.name=Terminal
 activities.category.terminals.description=Use the terminal to connect to remote hosts via telnet, ssh and others.
diff --git a/terminals/plugins/org.eclipse.tcf.te.ui.terminals/plugin.xml b/terminals/plugins/org.eclipse.tcf.te.ui.terminals/plugin.xml
index 0fb5c9f74..f9e422e57 100644
--- a/terminals/plugins/org.eclipse.tcf.te.ui.terminals/plugin.xml
+++ b/terminals/plugins/org.eclipse.tcf.te.ui.terminals/plugin.xml
@@ -7,9 +7,14 @@
 
 <!-- View contributions -->
    <extension point="org.eclipse.ui.views">
+      <category
+            id="org.eclipse.tcf.te.ui.terminals.views.category"
+            name="%ViewCategory.name">
+      </category>
+
       <view
             allowMultiple="true"
-            category="org.eclipse.tcf.te.ui.views.category"
+            category="org.eclipse.tcf.te.ui.terminals.views.category"
             class="org.eclipse.tcf.te.ui.terminals.view.TerminalsView"
             icon="icons/eview16/terminal_view.gif"
             id="org.eclipse.tcf.te.ui.terminals.TerminalsView"
@@ -70,6 +75,32 @@
                visible="false">
          </view>
       </perspectiveExtension>
+
+      <perspectiveExtension targetID="org.eclipse.jdt.ui.JavaPerspective">
+		 <!-- Register the view shortcuts  -->
+         <viewShortcut id="org.eclipse.tcf.te.ui.terminals.TerminalsView"/>
+         <!-- Place the Terminals view relative to the Task List view -->
+         <view
+               id="org.eclipse.tcf.te.ui.terminals.TerminalsView"
+               minimized="false"
+               relationship="stack"
+               relative="org.eclipse.ui.views.TaskList"
+               visible="false">
+         </view>
+      </perspectiveExtension>
+
+      <perspectiveExtension targetID="org.eclipse.pde.ui.PDEPerspective">
+		 <!-- Register the view shortcuts  -->
+         <viewShortcut id="org.eclipse.tcf.te.ui.terminals.TerminalsView"/>
+         <!-- Place the Terminals view relative to the Task List view -->
+         <view
+               id="org.eclipse.tcf.te.ui.terminals.TerminalsView"
+               minimized="false"
+               relationship="stack"
+               relative="org.eclipse.ui.views.TaskList"
+               visible="false">
+         </view>
+      </perspectiveExtension>
       
       <perspectiveExtension targetID="*">
          <!-- Show In shortcut -->
@@ -184,20 +215,25 @@
 
 <!-- Command contributions -->
    <extension point="org.eclipse.ui.commands">
+      <category
+            id="org.eclipse.tcf.te.ui.terminals.commands.category"
+            name="%command.category.name">
+      </category>
+   
       <command
-            categoryId="org.eclipse.tcf.te.ui.commands.category"
+            categoryId="org.eclipse.tcf.te.ui.terminals.commands.category"
             helpContextId="org.eclipse.tcf.te.ui.terminals.command_Launch"
             id="org.eclipse.tcf.te.ui.terminals.command.launch"
             name="%command.launch.selection.name">
       </command>
       <command
-            categoryId="org.eclipse.tcf.te.ui.commands.category"
+            categoryId="org.eclipse.tcf.te.ui.terminals.commands.category"
             helpContextId="org.eclipse.tcf.te.ui.terminals.command_Launch"
             id="org.eclipse.tcf.te.ui.terminals.command.launchToolbar"
             name="%command.launch.name">
       </command>
       <command
-            categoryId="org.eclipse.tcf.te.ui.commands.category"
+            categoryId="org.eclipse.tcf.te.ui.terminals.commands.category"
             helpContextId="org.eclipse.tcf.te.ui.terminals.command_Disconnect"
             id="org.eclipse.tcf.te.ui.terminals.command.disconnect"
             name="%command.disconnect.name">