From 3c24c4231fbe72642430855846827b2acdf8e7ff Mon Sep 17 00:00:00 2001
From: Uwe Stieber <uwe.stieber@windriver.com>
Date: Tue, 17 Feb 2015 15:13:28 +0100
Subject: [PATCH] Terminals: Fix invalid category ids for view and commands

---
 .../plugin.properties                         |  2 +-
 .../plugin.properties                         |  4 +-
 .../plugin.xml                                |  4 +-
 .../terminals/local/nls/Messages.properties   |  4 +-
 .../plugin.properties                         |  2 +-
 .../plugin.properties                         |  2 +-
 .../plugin.xml                                |  2 +-
 .../plugin.properties                         |  2 +-
 .../plugin.properties                         |  2 +-
 .../plugin.properties                         |  2 +-
 .../plugin.properties                         |  9 ++--
 .../plugin.xml                                | 44 +++++++++++++++++--
 12 files changed, 59 insertions(+), 20 deletions(-)

diff --git a/plugins/org.eclipse.tcf.te.core.terminals/plugin.properties b/plugins/org.eclipse.tcf.te.core.terminals/plugin.properties
index 8bb225013de..7b9c05f4e64 100644
--- a/plugins/org.eclipse.tcf.te.core.terminals/plugin.properties
+++ b/plugins/org.eclipse.tcf.te.core.terminals/plugin.properties
@@ -8,7 +8,7 @@
 # Wind River Systems - initial API and implementation
 ##################################################################################
 
-pluginName = Target Explorer, Terminals Core
+pluginName = Terminals Core
 providerName = Eclipse.org - Target Explorer
 
 ExtensionPoint.contextPropertiesProviders = Terminal Context Properties Providers
diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.local/plugin.properties b/plugins/org.eclipse.tcf.te.ui.terminals.local/plugin.properties
index 2219f89d76e..be513782cda 100644
--- a/plugins/org.eclipse.tcf.te.ui.terminals.local/plugin.properties
+++ b/plugins/org.eclipse.tcf.te.ui.terminals.local/plugin.properties
@@ -8,7 +8,7 @@
 # Wind River Systems - initial API and implementation
 ##################################################################################
 
-pluginName = Target Explorer, Terminals Local Connector
+pluginName = Terminals Local Connector
 providerName = Eclipse.org - Target Explorer
 
 # ----- Commands and Menu contributions -----
@@ -20,4 +20,4 @@ menu.showIn.localterminal.label = Terminals
 
 # ----- Preference Pages -----
 
-preference.page.name=Terminals
+preference.page.name=Terminals View
diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.local/plugin.xml b/plugins/org.eclipse.tcf.te.ui.terminals.local/plugin.xml
index 22e2af1c24d..45808813c7c 100644
--- a/plugins/org.eclipse.tcf.te.ui.terminals.local/plugin.xml
+++ b/plugins/org.eclipse.tcf.te.ui.terminals.local/plugin.xml
@@ -67,7 +67,7 @@
 <!-- Command contributions -->
    <extension point="org.eclipse.ui.commands">
       <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.local.command_Launch"
             id="org.eclipse.tcf.te.ui.terminals.local.command.launch"
             name="%command.launch.name">
@@ -101,7 +101,7 @@
 <!-- Preference page contributions -->
    <extension point="org.eclipse.ui.preferencePages">
       <page
-            category="org.eclipse.tcf.te.ui.preferences.general"
+            category="org.eclipse.tm.terminal.TerminalPreferencePage"
             class="org.eclipse.tcf.te.ui.terminals.local.showin.preferences.PreferencePage"
             id="org.eclipse.tcf.te.ui.terminals.local.showin.preferences"
             name="%preference.page.name">
diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/nls/Messages.properties b/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/nls/Messages.properties
index 626196402ed..accf1b47f28 100644
--- a/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/nls/Messages.properties
+++ b/plugins/org.eclipse.tcf.te.ui.terminals.local/src/org/eclipse/tcf/te/ui/terminals/local/nls/Messages.properties
@@ -20,9 +20,9 @@ ExternalExecutablesDialog_field_args=Arguments:
 ExternalExecutablesDialog_field_icon=Icon:
 ExternalExecutablesDialog_field_translate=Translate Backslashes on Paste
 
-# ***** Preference Pages *****
+# -----  Preference Pages  -----
 
-PreferencePage_label=General settings for Terminals:
+PreferencePage_label=General Terminals view settings:
 PreferencePage_executables_label="Show In ..." Custom Entries
 PreferencePage_executables_column_name_label=Name
 PreferencePage_executables_column_path_label=Path
diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.process/plugin.properties b/plugins/org.eclipse.tcf.te.ui.terminals.process/plugin.properties
index 154dba87e50..3b864f4b95f 100644
--- a/plugins/org.eclipse.tcf.te.ui.terminals.process/plugin.properties
+++ b/plugins/org.eclipse.tcf.te.ui.terminals.process/plugin.properties
@@ -8,7 +8,7 @@
 # Wind River Systems - initial API and implementation
 ##################################################################################
 
-pluginName = Target Explorer, Terminals Process Connector
+pluginName = Terminals Process Connector
 providerName = Eclipse.org - Target Explorer
 
 # ----- Terminal Connectors -----
diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.rse/plugin.properties b/plugins/org.eclipse.tcf.te.ui.terminals.rse/plugin.properties
index b6692c2f16c..5fa615038a3 100644
--- a/plugins/org.eclipse.tcf.te.ui.terminals.rse/plugin.properties
+++ b/plugins/org.eclipse.tcf.te.ui.terminals.rse/plugin.properties
@@ -8,7 +8,7 @@
 # Wind River Systems - initial API and implementation
 ##################################################################################
 
-pluginName = Target Explorer, Terminals RSE Add-on
+pluginName = Terminals RSE Add-on
 providerName = Eclipse.org - Target Explorer
 
 # ----- Commands and Menu contributions -----
diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.rse/plugin.xml b/plugins/org.eclipse.tcf.te.ui.terminals.rse/plugin.xml
index 00c7cee50dc..25a58712bc0 100644
--- a/plugins/org.eclipse.tcf.te.ui.terminals.rse/plugin.xml
+++ b/plugins/org.eclipse.tcf.te.ui.terminals.rse/plugin.xml
@@ -77,7 +77,7 @@
 <!-- Command contributions -->
    <extension point="org.eclipse.ui.commands">
       <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.rse.command_Launch"
             id="org.eclipse.tcf.te.ui.terminals.rse.command.launch"
             name="%command.launch.name">
diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.serial/plugin.properties b/plugins/org.eclipse.tcf.te.ui.terminals.serial/plugin.properties
index a471a57b605..d66a9e897ba 100644
--- a/plugins/org.eclipse.tcf.te.ui.terminals.serial/plugin.properties
+++ b/plugins/org.eclipse.tcf.te.ui.terminals.serial/plugin.properties
@@ -8,7 +8,7 @@
 # Wind River Systems - initial API and implementation
 ##################################################################################
 
-pluginName = Target Explorer, Serial Terminals Extensions
+pluginName = Terminals Serial Extensions
 providerName = Eclipse.org - Target Explorer
 
 # ----- Terminal Launcher Delegates -----
diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.ssh/plugin.properties b/plugins/org.eclipse.tcf.te.ui.terminals.ssh/plugin.properties
index 9c7fb35b455..60c9aebeb40 100644
--- a/plugins/org.eclipse.tcf.te.ui.terminals.ssh/plugin.properties
+++ b/plugins/org.eclipse.tcf.te.ui.terminals.ssh/plugin.properties
@@ -8,7 +8,7 @@
 # Wind River Systems - initial API and implementation
 ##################################################################################
 
-pluginName = Target Explorer, SSH Terminals Extensions
+pluginName = Terminals SSH Extensions
 providerName = Eclipse.org - Target Explorer
 
 # ----- Terminal Connector Types -----
diff --git a/plugins/org.eclipse.tcf.te.ui.terminals.telnet/plugin.properties b/plugins/org.eclipse.tcf.te.ui.terminals.telnet/plugin.properties
index 80cdf13ce88..ddd14ef4a19 100644
--- a/plugins/org.eclipse.tcf.te.ui.terminals.telnet/plugin.properties
+++ b/plugins/org.eclipse.tcf.te.ui.terminals.telnet/plugin.properties
@@ -8,7 +8,7 @@
 # Wind River Systems - initial API and implementation
 ##################################################################################
 
-pluginName = Target Explorer, Telnet Terminals Extensions
+pluginName = Terminals Telnet Extensions
 providerName = Eclipse.org - Target Explorer
 
 # ----- Terminal Launcher Delegates -----
diff --git a/plugins/org.eclipse.tcf.te.ui.terminals/plugin.properties b/plugins/org.eclipse.tcf.te.ui.terminals/plugin.properties
index 509b0a050b9..a9d9ded2254 100644
--- a/plugins/org.eclipse.tcf.te.ui.terminals/plugin.properties
+++ b/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/plugins/org.eclipse.tcf.te.ui.terminals/plugin.xml b/plugins/org.eclipse.tcf.te.ui.terminals/plugin.xml
index 0fb5c9f740a..f9e422e573e 100644
--- a/plugins/org.eclipse.tcf.te.ui.terminals/plugin.xml
+++ b/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">