From 70fc23d8c393d5266f0c1f260aa2b83aa8a134d1 Mon Sep 17 00:00:00 2001
From: Markus Schorn <markus.schorn@windriver.com>
Date: Mon, 27 Aug 2007 14:59:00 +0000
Subject: [PATCH] Call Hierarchy Filter fails to hide enumerators.

---
 .../cdt/internal/ui/callhierarchy/CHContentProvider.java  | 2 +-
 .../cdt/internal/ui/callhierarchy/CHMultiDefNode.java     | 6 +++---
 .../org/eclipse/cdt/internal/ui/callhierarchy/CHNode.java | 8 +++++---
 .../eclipse/cdt/internal/ui/callhierarchy/CHViewPart.java | 2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHContentProvider.java
index 793d9375687..20252d33f1b 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHContentProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHContentProvider.java
@@ -75,7 +75,7 @@ public class CHContentProvider extends AsyncTreeContentProvider {
 					return NO_CHILDREN;
 				}
 			}
-			else if (node.isVariable() || node.isMacro()) { 
+			else if (node.isVariableOrEnumerator() || node.isMacro()) { 
 				return NO_CHILDREN;
 			}
 			
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHMultiDefNode.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHMultiDefNode.java
index 371c432cadb..0f71e18434f 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHMultiDefNode.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHMultiDefNode.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006 Wind River Systems, Inc. and others.
+ * Copyright (c) 2006, 2007 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
@@ -38,8 +38,8 @@ public class CHMultiDefNode extends CHNode {
 		return fChildren[0].isMacro();
 	}
 
-	public boolean isVariable() {
-		return fChildren[0].isVariable();
+	public boolean isVariableOrEnumerator() {
+		return fChildren[0].isVariableOrEnumerator();
 	}
 
 	
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHNode.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHNode.java
index 8dec0a69bc0..abffc892749 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHNode.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHNode.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006 Wind River Systems, Inc. and others.
+ * Copyright (c) 2006, 2007 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
@@ -18,6 +18,7 @@ import java.util.List;
 import org.eclipse.core.runtime.IAdaptable;
 
 import org.eclipse.cdt.core.model.ICElement;
+import org.eclipse.cdt.core.model.IEnumerator;
 import org.eclipse.cdt.core.model.IMacro;
 import org.eclipse.cdt.core.model.ITranslationUnit;
 import org.eclipse.cdt.core.model.IVariableDeclaration;
@@ -121,8 +122,9 @@ public class CHNode implements IAdaptable {
 		return fRepresentedDecl instanceof IMacro;
 	}
 
-	public boolean isVariable() {
-		return fRepresentedDecl instanceof IVariableDeclaration;
+	public boolean isVariableOrEnumerator() {
+		return fRepresentedDecl instanceof IVariableDeclaration ||
+			fRepresentedDecl instanceof IEnumerator;
 	}
 	
 	public int getFirstReferenceOffset() {
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHViewPart.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHViewPart.java
index bd7b086e58e..a070230819c 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHViewPart.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHViewPart.java
@@ -374,7 +374,7 @@ public class CHViewPart extends ViewPart {
             public boolean select(Viewer viewer, Object parentElement, Object element) {
                 if (element instanceof CHNode) {
                 	CHNode node= (CHNode) element;
-                    return !node.isVariable();
+                    return !node.isVariableOrEnumerator();
                 }
                 return true;
             }