From 75b3224c1cc0761f91b85af8aa5660a092289f0d Mon Sep 17 00:00:00 2001
From: Chris Wiebe <cwiebe@ftml.net>
Date: Thu, 25 Nov 2004 02:19:52 +0000
Subject: [PATCH] 2004-11-24 Chris Wiebe

	fix command binding for OpenTypeInHierarchyAction
	* plugin.xml
---
 core/org.eclipse.cdt.ui/ChangeLog                  |  5 +++++
 core/org.eclipse.cdt.ui/browser/ChangeLog-browser  |  5 +++++
 .../typehierarchy/OpenTypeInHierarchyAction.java   | 10 +++++-----
 core/org.eclipse.cdt.ui/plugin.xml                 | 14 +++++++++++++-
 4 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index 682e29c905b..e71a7943e11 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-24 Chris Wiebe
+
+	fix command binding for OpenTypeInHierarchyAction
+	* plugin.xml
+	
 2004-11-24 Alain Magloire
 	Remove unused class, reduce confusion in code maintainance.
 	* src/org/eclipse/cdt/internal/ui/util/ProblemItemMapper.java
diff --git a/core/org.eclipse.cdt.ui/browser/ChangeLog-browser b/core/org.eclipse.cdt.ui/browser/ChangeLog-browser
index d8c0c0b9bdd..fc34cab4aff 100644
--- a/core/org.eclipse.cdt.ui/browser/ChangeLog-browser
+++ b/core/org.eclipse.cdt.ui/browser/ChangeLog-browser
@@ -1,3 +1,8 @@
+2004-11-24 Chris Wiebe
+
+	fix exception in OpenTypeInHierarchyAction
+	* browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/OpenTypeInHierarchyAction.java
+
 2004-11-08 Chris Wiebe
 
 	fix for 68883
diff --git a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/OpenTypeInHierarchyAction.java b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/OpenTypeInHierarchyAction.java
index eb729bc010b..3bddab3cd4e 100644
--- a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/OpenTypeInHierarchyAction.java
+++ b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/typehierarchy/OpenTypeInHierarchyAction.java
@@ -16,6 +16,7 @@ import org.eclipse.cdt.core.browser.AllTypesCache;
 import org.eclipse.cdt.core.browser.ITypeInfo;
 import org.eclipse.cdt.core.browser.ITypeSearchScope;
 import org.eclipse.cdt.core.browser.TypeSearchScope;
+import org.eclipse.cdt.core.browser.TypeUtil;
 import org.eclipse.cdt.core.model.ICElement;
 import org.eclipse.cdt.internal.ui.browser.opentype.OpenTypeDialog;
 import org.eclipse.cdt.internal.ui.browser.opentype.OpenTypeMessages;
@@ -89,11 +90,10 @@ public class OpenTypeInHierarchyAction implements IWorkbenchWindowActionDelegate
 		ITypeInfo info = (ITypeInfo) dialog.getFirstResult();
 		if (info == null)
 			return;
-
-		Object[] types= dialog.getResult();
-		if (types != null && types.length > 0) {
-			ICElement type= (ICElement)types[0];
-			OpenTypeHierarchyUtil.open(new ICElement[] { type }, fWindow);
+		
+		ICElement celem = AllTypesCache.getElementForType(info, false, true, null);
+		if (celem != null) {
+			OpenTypeHierarchyUtil.open(new ICElement[] { celem }, fWindow);
 		}
 	}
 	
diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index 8e23e7bd0fc..3f42d9ab2a0 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -886,10 +886,22 @@
       </command>
       <keyBinding
             string="F4"
-            scope="org.eclipse.ui.globalScope"
+            scope="org.eclipse.cdt.ui.cEditorScope"
             command="org.eclipse.cdt.ui.edit.text.c.open.type.hierarchy"
             configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
       </keyBinding>
+      <command
+            name="%ActionDefinition.openTypeInHierarchy.name"
+            description="%ActionDefinition.openTypeInHierarchy.description"
+            category="org.eclipse.ui.category.navigate"
+            id="org.eclipse.cdt.ui.navigate.open.type.in.hierarchy">
+      </command>
+      <keyBinding
+            string="Ctrl+Shift+H"
+            scope="org.eclipse.cdt.ui.cEditorScope"
+            command="org.eclipse.cdt.ui.navigate.open.type.in.hierarchy"
+            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </keyBinding>
       <command
             name="%ActionDefinition.addInclude.name"
             description="%ActionDefinition.addInclude.description"