From 597265c5749e519254c24fffe3e80774a2c53c77 Mon Sep 17 00:00:00 2001
From: Serge Beauchamp <sergebeauchamp@mac.com>
Date: Thu, 26 Sep 2013 14:42:18 +0100
Subject: [PATCH] Bug 418098 - Entering 'Tool chain' in the preference dialog
 should return the proper preference panel

Change-Id: Iedf013131c0445914436536da3d6db59173764f7
Signed-off-by: Serge Beauchamp <sergebeauchamp@mac.com>
Reviewed-on: https://git.eclipse.org/r/16797
Reviewed-by: Andrew Gvozdev <angvoz.dev@gmail.com>
IP-Clean: Andrew Gvozdev <angvoz.dev@gmail.com>
Tested-by: Andrew Gvozdev <angvoz.dev@gmail.com>
---
 .../plugin.properties                         |  2 ++
 .../plugin.xml                                | 20 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties b/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties
index 72b9523595a..c6927370e8a 100755
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties
@@ -48,6 +48,8 @@ CDTPathSymbolsProperty.name=Paths and Symbols
 CDTExpPathSymbolsProperty.name=Export Settings
 CDTBuildProperty.name=Settings
 CDTToolchainProperty.name=Tool Chain Editor
+CDTToolchainProperty.keyword.toolchain1=toolchain
+CDTToolchainProperty.keyword.toolchain2=tool chain
 CDTVariablesProperty.name=Build Variables
 Discovery.options=Discovery Options
 Environment=Environment
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
index 669c1dc92bd..59be74b7713 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
@@ -64,7 +64,14 @@
             category="org.eclipse.cdt.ui.preferences.CPluginPreferencePage"
             class="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_PropertyPage"
             id="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_PropertyPage"
-            name="%propSettingsPrefName"/>
+            name="%propSettingsPrefName">
+         <keywordReference
+               id="org.eclipse.cdt.managedbuilder.ui.keyword.toolchain1">
+         </keywordReference>
+         <keywordReference
+               id="org.eclipse.cdt.managedbuilder.ui.keyword.toolchain2">
+         </keywordReference>
+      </page>
       <page
             category="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_PropertyPage"
             class="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_MultiConfig"
@@ -715,5 +722,16 @@
             class="org.eclipse.cdt.managedbuilder.internal.ui.language.settings.providers.ScannerDiscoveryGlobalConsole">
       </CBuildConsole>
    </extension>
+     <extension
+           point="org.eclipse.ui.keywords">
+        <keyword
+              id="org.eclipse.cdt.managedbuilder.ui.keyword.toolchain1"
+              label="%CDTToolchainProperty.keyword.toolchain1">
+        </keyword>
+        <keyword
+              id="org.eclipse.cdt.managedbuilder.ui.keyword.toolchain2"
+              label="%CDTToolchainProperty.keyword.toolchain2">
+        </keyword>
+     </extension>
 
 </plugin>